diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2012-03-09 18:37:58 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2012-04-07 11:45:24 +0200 |
| commit | 0ca0aa08eb70dd23c1bc5d154c3d8ba157b712e9 (patch) | |
| tree | 03d6e9538c5f3cf8583a63615d641e9cc556177f | |
| parent | 05d334eca9994680a6cb8fba3f19955356ccf72a (diff) | |
| download | linux-3.10-0ca0aa08eb70dd23c1bc5d154c3d8ba157b712e9.tar.gz linux-3.10-0ca0aa08eb70dd23c1bc5d154c3d8ba157b712e9.tar.bz2 linux-3.10-0ca0aa08eb70dd23c1bc5d154c3d8ba157b712e9.zip | |
hamachi: stop using net_device.{base_addr, irq}.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| -rw-r--r-- | drivers/net/ethernet/packetengines/hamachi.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c index 0d29f5f4b8e..c2367158350 100644 --- a/drivers/net/ethernet/packetengines/hamachi.c +++ b/drivers/net/ethernet/packetengines/hamachi.c @@ -683,8 +683,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev, } hmp->base = ioaddr; - dev->base_addr = (unsigned long)ioaddr; - dev->irq = irq; pci_set_drvdata(pdev, dev); hmp->chip_id = chip_id; @@ -859,14 +857,11 @@ static int hamachi_open(struct net_device *dev) u32 rx_int_var, tx_int_var; u16 fifo_info; - i = request_irq(dev->irq, hamachi_interrupt, IRQF_SHARED, dev->name, dev); + i = request_irq(hmp->pci_dev->irq, hamachi_interrupt, IRQF_SHARED, + dev->name, dev); if (i) return i; - if (hamachi_debug > 1) - printk(KERN_DEBUG "%s: hamachi_open() irq %d.\n", - dev->name, dev->irq); - hamachi_init_ring(dev); #if ADDRLEN == 64 @@ -1705,7 +1700,7 @@ static int hamachi_close(struct net_device *dev) } #endif /* __i386__ debugging only */ - free_irq(dev->irq, dev); + free_irq(hmp->pci_dev->irq, dev); del_timer_sync(&hmp->timer); |