Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / net / ethernet / nvidia / forcedeth.c

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index aca13046e4326a1fd2f6be0864dac06749e2647b..d93a088debc3cb0bf61ea3e7b5683e2924f1f167 100644 (file)
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -3942,13 +3942,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                ret = pci_enable_msi(np->pci_dev);
                if (ret == 0) {
                        np->msi_flags |= NV_MSI_ENABLED;
-                       dev->irq = np->pci_dev->irq;
                        if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) {
                                netdev_info(dev, "request_irq failed %d\n",
                                            ret);
                                pci_disable_msi(np->pci_dev);
                                np->msi_flags &= ~NV_MSI_ENABLED;
-                               dev->irq = np->pci_dev->irq;
                                goto out_err;
                        }
 
@@ -5649,9 +5647,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
        np->base = ioremap(addr, np->register_size);
        if (!np->base)
                goto out_relreg;
-       dev->base_addr = (unsigned long)np->base;
-
-       dev->irq = pci_dev->irq;
 
        np->rx_ring_size = RX_RING_DEFAULT;
        np->tx_ring_size = TX_RING_DEFAULT;