]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: forcedeth: remove unnecessary pci_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Mon, 9 Dec 2013 03:27:50 +0000 (12:27 +0900)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Dec 2013 23:09:28 +0000 (18:09 -0500)
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/nvidia/forcedeth.c

index ab67babbfdd1f40b487f19023f81f25398c0ab27..d8bdaf6d82d2b8d5f2e698b050d68d63c5dcd274 100644 (file)
@@ -6017,7 +6017,6 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
 out_error:
        if (phystate_orig)
                writel(phystate|NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
-       pci_set_drvdata(pci_dev, NULL);
 out_freering:
        free_rings(dev);
 out_unmap:
@@ -6088,7 +6087,6 @@ static void nv_remove(struct pci_dev *pci_dev)
        pci_release_regions(pci_dev);
        pci_disable_device(pci_dev);
        free_netdev(dev);
-       pci_set_drvdata(pci_dev, NULL);
 }
 
 #ifdef CONFIG_PM_SLEEP