diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-10-17 20:21:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-18 00:03:29 -0400 |
commit | 932257efaeaa83e2b09b2dc5d41e34c3e4e0bc3c (patch) | |
tree | 98f3b08915b47677359b5fb18eedf4b0f2c6b73b /drivers/net/ethernet/broadcom | |
parent | b9a7803c401718ba7d87ed232849d33eed08fb62 (diff) |
net: bnx2x: remove unnecessary pci_set_drvdata()
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index e53ff1eb3a84..8fd343201576 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -12297,7 +12297,6 @@ err_out_release: | |||
12297 | 12297 | ||
12298 | err_out_disable: | 12298 | err_out_disable: |
12299 | pci_disable_device(pdev); | 12299 | pci_disable_device(pdev); |
12300 | pci_set_drvdata(pdev, NULL); | ||
12301 | 12300 | ||
12302 | err_out: | 12301 | err_out: |
12303 | return rc; | 12302 | return rc; |
@@ -12840,7 +12839,6 @@ init_one_exit: | |||
12840 | pci_release_regions(pdev); | 12839 | pci_release_regions(pdev); |
12841 | 12840 | ||
12842 | pci_disable_device(pdev); | 12841 | pci_disable_device(pdev); |
12843 | pci_set_drvdata(pdev, NULL); | ||
12844 | 12842 | ||
12845 | return rc; | 12843 | return rc; |
12846 | } | 12844 | } |
@@ -12923,7 +12921,6 @@ static void __bnx2x_remove(struct pci_dev *pdev, | |||
12923 | pci_release_regions(pdev); | 12921 | pci_release_regions(pdev); |
12924 | 12922 | ||
12925 | pci_disable_device(pdev); | 12923 | pci_disable_device(pdev); |
12926 | pci_set_drvdata(pdev, NULL); | ||
12927 | } | 12924 | } |
12928 | 12925 | ||
12929 | static void bnx2x_remove_one(struct pci_dev *pdev) | 12926 | static void bnx2x_remove_one(struct pci_dev *pdev) |