diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-09-10 07:27:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-09-26 15:13:44 -0400 |
commit | 0acfd4b06e4b4550c94e24a582853df16d4eb5a5 (patch) | |
tree | 8c431db3c0bfbb8ebe238bfb985737a814a383e5 /drivers/net/wireless/ipw2x00/ipw2200.c | |
parent | 3f06534183a0dd68a40fb286da0025d95a586eb0 (diff) |
wireless: ipw2x00: 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: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 6b823a1ab789..f394af777cf5 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -11885,7 +11885,6 @@ static int ipw_pci_probe(struct pci_dev *pdev, | |||
11885 | pci_release_regions(pdev); | 11885 | pci_release_regions(pdev); |
11886 | out_pci_disable_device: | 11886 | out_pci_disable_device: |
11887 | pci_disable_device(pdev); | 11887 | pci_disable_device(pdev); |
11888 | pci_set_drvdata(pdev, NULL); | ||
11889 | out_free_libipw: | 11888 | out_free_libipw: |
11890 | free_libipw(priv->net_dev, 0); | 11889 | free_libipw(priv->net_dev, 0); |
11891 | out: | 11890 | out: |
@@ -11966,7 +11965,6 @@ static void ipw_pci_remove(struct pci_dev *pdev) | |||
11966 | iounmap(priv->hw_base); | 11965 | iounmap(priv->hw_base); |
11967 | pci_release_regions(pdev); | 11966 | pci_release_regions(pdev); |
11968 | pci_disable_device(pdev); | 11967 | pci_disable_device(pdev); |
11969 | pci_set_drvdata(pdev, NULL); | ||
11970 | /* wiphy_unregister needs to be here, before free_libipw */ | 11968 | /* wiphy_unregister needs to be here, before free_libipw */ |
11971 | wiphy_unregister(priv->ieee->wdev.wiphy); | 11969 | wiphy_unregister(priv->ieee->wdev.wiphy); |
11972 | kfree(priv->ieee->a_band.channels); | 11970 | kfree(priv->ieee->a_band.channels); |