Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

starfire: stop using net_device.{base_addr, irq}.

Browse Source 
It's useless to check mem_start on a newly allocated device as well.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Ion Badulescu <ionut@badula.org>
This commit is contained in:
Francois Romieu 2012-03-09 11:53:42 +01:00
parent 0c18acc1ed
commit ea8f2ed0f1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/adaptec/starfire.c
View File

@ -753,9 +753,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
/* wait a little longer */ /* wait a little longer */
udelay(1000); udelay(1000);
dev->base_addr = (unsigned long)base;
dev->irq = irq;
np = netdev_priv(dev); np = netdev_priv(dev);
np->dev = dev; np->dev = dev;
np->base = base; np->base = base;
@ -773,8 +770,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
drv_flags = netdrv_tbl[chip_idx].drv_flags; drv_flags = netdrv_tbl[chip_idx].drv_flags;
option = card_idx < MAX_UNITS ? options[card_idx] : 0; option = card_idx < MAX_UNITS ? options[card_idx] : 0;
if (dev->mem_start)
option = dev->mem_start;
/* The lower four bits are the media type. */ /* The lower four bits are the media type. */
if (option & 0x200) if (option & 0x200)
@ -909,13 +904,14 @@ static int netdev_open(struct net_device *dev)
const __be32 *fw_rx_data, *fw_tx_data; const __be32 *fw_rx_data, *fw_tx_data;
struct netdev_private *np = netdev_priv(dev); struct netdev_private *np = netdev_priv(dev);
void __iomem *ioaddr = np->base; void __iomem *ioaddr = np->base;
const int irq = np->pci_dev->irq;
int i, retval; int i, retval;
size_t tx_size, rx_size; size_t tx_size, rx_size;
size_t tx_done_q_size, rx_done_q_size, tx_ring_size, rx_ring_size; size_t tx_done_q_size, rx_done_q_size, tx_ring_size, rx_ring_size;
/* Do we ever need to reset the chip??? */ /* Do we ever need to reset the chip??? */
retval = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev); retval = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
if (retval) if (retval)
return retval; return retval;
@ -924,7 +920,7 @@ static int netdev_open(struct net_device *dev)
writel(1, ioaddr + PCIDeviceConfig); writel(1, ioaddr + PCIDeviceConfig);
if (debug > 1) if (debug > 1)
printk(KERN_DEBUG "%s: netdev_open() irq %d.\n", printk(KERN_DEBUG "%s: netdev_open() irq %d.\n",
dev->name, dev->irq); dev->name, irq);
/* Allocate the various queues. */ /* Allocate the various queues. */
if (!np->queue_mem) { if (!np->queue_mem) {
@ -935,7 +931,7 @@ static int netdev_open(struct net_device *dev)
np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size; np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size;
np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma); np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma);
if (np->queue_mem == NULL) { if (np->queue_mem == NULL) {
free_irq(dev->irq, dev); free_irq(irq, dev);
return -ENOMEM; return -ENOMEM;
} }
@ -1962,7 +1958,7 @@ static int netdev_close(struct net_device *dev)
} }
} }
free_irq(dev->irq, dev); free_irq(np->pci_dev->irq, dev);
/* Free all the skbuffs in the Rx queue. */ /* Free all the skbuffs in the Rx queue. */
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {