diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2012-03-09 15:28:18 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2012-04-07 11:45:24 +0200 |
| commit | 05d334eca9994680a6cb8fba3f19955356ccf72a (patch) | |
| tree | be85fb46c3702f02454e02e2888d0b74f71262d0 /drivers/net/ethernet/via | |
| parent | 93f7fab433606a0ee6153788213de2a822736322 (diff) | |
| download | talos-obmc-linux-05d334eca9994680a6cb8fba3f19955356ccf72a.tar.gz talos-obmc-linux-05d334eca9994680a6cb8fba3f19955356ccf72a.zip | |
via-rhine: stop using net_device.{base_addr, irq}.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: David Lv <DavidLv@viatech.com.cn>
Diffstat (limited to 'drivers/net/ethernet/via')
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 39b8cf3dafcd..47b411fe3ecb 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -687,9 +687,12 @@ static void __devinit rhine_reload_eeprom(long pioaddr, struct net_device *dev) #ifdef CONFIG_NET_POLL_CONTROLLER static void rhine_poll(struct net_device *dev) { - disable_irq(dev->irq); - rhine_interrupt(dev->irq, (void *)dev); - enable_irq(dev->irq); + struct rhine_private *rp = netdev_priv(dev); + const int irq = rp->pdev->irq; + + disable_irq(irq); + rhine_interrupt(irq, dev); + enable_irq(irq); } #endif @@ -970,7 +973,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, } #endif /* USE_MMIO */ - dev->base_addr = (unsigned long)ioaddr; rp->base = ioaddr; /* Get chip registers into a sane state */ @@ -993,8 +995,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, if (!phy_id) phy_id = ioread8(ioaddr + 0x6C); - dev->irq = pdev->irq; - spin_lock_init(&rp->lock); mutex_init(&rp->task_lock); INIT_WORK(&rp->reset_task, rhine_reset_task); |
