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

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jon Mason <mason@myri.com>
Acked-by: Andrew Gallatin <gallatin@myri.com>

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 27273ae1a6e6d0d48d0bb62ef80c5e9de079fcee..90153fc983cbad58cb3a68ae6ff4f9bb5c85762b 100644 (file)
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -4033,7 +4033,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netdev->netdev_ops = &myri10ge_netdev_ops;
        netdev->mtu = myri10ge_initial_mtu;
-       netdev->base_addr = mgp->iomem_base;
        netdev->hw_features = mgp->features | NETIF_F_LRO | NETIF_F_RXCSUM;
        netdev->features = netdev->hw_features;
 
@@ -4047,12 +4046,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                netdev->vlan_features &= ~NETIF_F_TSO;
 
        /* make sure we can get an irq, and that MSI can be
-        * setup (if available).  Also ensure netdev->irq
-        * is set to correct value if MSI is enabled */
+        * setup (if available). */
        status = myri10ge_request_irq(mgp);
        if (status != 0)
                goto abort_with_firmware;
-       netdev->irq = pdev->irq;
        myri10ge_free_irq(mgp);
 
        /* Save configuration space to be restored if the
@@ -4077,7 +4074,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        else
                dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
                         mgp->msi_enabled ? "MSI" : "xPIC",
-                        netdev->irq, mgp->tx_boundary, mgp->fw_name,
+                        pdev->irq, mgp->tx_boundary, mgp->fw_name,
                         (mgp->wc_enabled ? "Enabled" : "Disabled"));
 
        board_number++;