diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-22 01:21:39 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-22 01:21:39 +0400 |
| commit | 3167fe98ce88ba617300443b54f45549b39417c5 (patch) | |
| tree | 70e1f3850304425bb166cc6216c99040145c862f /drivers/net/ethernet/jme.c | |
| parent | 5eccdfaabcf44f71702ba033d9c24821111749e1 (diff) | |
| parent | 390e1b86abbda7c0195bbe89dc5d2aa38134fdc1 (diff) | |
| download | linux-3167fe98ce88ba617300443b54f45549b39417c5.tar.xz | |
Merge branch 'pci_set_drvdata'
Jingoo Han says:
====================
net: ethernet: remove unnecessary pci_set_drvdata() part 2
Since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound),
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/jme.c')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index b56d2a29cd0e..f5685c0d0579 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -3192,7 +3192,6 @@ jme_init_one(struct pci_dev *pdev, err_out_unmap: iounmap(jme->regs); err_out_free_netdev: - pci_set_drvdata(pdev, NULL); free_netdev(netdev); err_out_release_regions: pci_release_regions(pdev); @@ -3210,7 +3209,6 @@ jme_remove_one(struct pci_dev *pdev) unregister_netdev(netdev); iounmap(jme->regs); - pci_set_drvdata(pdev, NULL); free_netdev(netdev); pci_release_regions(pdev); pci_disable_device(pdev); |