8139cp: stop using net_device.{base_addr, irq}.

(backported from upstream commit a69afe3263717ba9384cf18d05722c598f6820af)
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 1ff9199c6ba34f698fcbfe4757c6364213307880..4af43dfec0bc310cf5c32b8ce375ebf5d1a8d68e 100644 (file)
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -667,9 +667,12 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
  */
 static void cp_poll_controller(struct net_device *dev)
 {
-       disable_irq(dev->irq);
-       cp_interrupt(dev->irq, dev);
-       enable_irq(dev->irq);
+       struct cp_private *cp = netdev_priv(dev);
+       const int irq = cp->pdev->irq;
+
+       disable_irq(irq);
+       cp_interrupt(irq, dev);
+       enable_irq(irq);
 }
 #endif
 
@@ -1148,6 +1151,7 @@ static void cp_free_rings (struct cp_private *cp)
 static int cp_open (struct net_device *dev)
 {
        struct cp_private *cp = netdev_priv(dev);
+       const int irq = cp->pdev->irq;
        int rc;
 
        netif_dbg(cp, ifup, dev, "enabling interface\n");
@@ -1160,7 +1164,7 @@ static int cp_open (struct net_device *dev)
 
        cp_init_hw(cp);
 
-       rc = request_irq(dev->irq, cp_interrupt, IRQF_SHARED, dev->name, dev);
+       rc = request_irq(irq, cp_interrupt, IRQF_SHARED, dev->name, dev);
        if (rc)
                goto err_out_hw;
 
@@ -1197,7 +1201,7 @@ static int cp_close (struct net_device *dev)
 
        spin_unlock_irqrestore(&cp->lock, flags);
 
-       free_irq(dev->irq, dev);
+       free_irq(cp->pdev->irq, dev);
 
        cp_free_rings(cp);
        return 0;
@@ -1943,7 +1947,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                       (unsigned long long)pciaddr);
                goto err_out_res;
        }
-       dev->base_addr = (unsigned long) regs;
        cp->regs = regs;
 
        cp_stop_hw(cp);
@@ -1970,14 +1973,12 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        /* disabled by default until verified */
        dev->hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
 
-       dev->irq = pdev->irq;
-
        rc = register_netdev(dev);
        if (rc)
                goto err_out_iomap;
 
-       netdev_info(dev, "RTL-8139C+ at 0x%lx, %pM, IRQ %d\n",
-                   dev->base_addr, dev->dev_addr, dev->irq);
+       netdev_info(dev, "RTL-8139C+ at 0x%p, %pM, IRQ %d\n",
+                   regs, dev->dev_addr, pdev->irq);
 
        pci_set_drvdata(pdev, dev);