diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-09-10 07:19:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-09-26 15:13:41 -0400 |
| commit | c1faf2cae280400e5368431da9c87ecfca8fbc62 (patch) | |
| tree | c818b7508d820eae0834e638bd155e931af4a62a | |
| parent | 8d450935ae7f9ceaaa2c6fb21856c286aa9ccf8e (diff) | |
wireless: iwlegacy: 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>
| -rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 9581d07a4242..dea3b50d68b9 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
| @@ -3811,7 +3811,6 @@ out_iounmap: | |||
| 3811 | out_pci_release_regions: | 3811 | out_pci_release_regions: |
| 3812 | pci_release_regions(pdev); | 3812 | pci_release_regions(pdev); |
| 3813 | out_pci_disable_device: | 3813 | out_pci_disable_device: |
| 3814 | pci_set_drvdata(pdev, NULL); | ||
| 3815 | pci_disable_device(pdev); | 3814 | pci_disable_device(pdev); |
| 3816 | out_ieee80211_free_hw: | 3815 | out_ieee80211_free_hw: |
| 3817 | ieee80211_free_hw(il->hw); | 3816 | ieee80211_free_hw(il->hw); |
| @@ -3888,7 +3887,6 @@ il3945_pci_remove(struct pci_dev *pdev) | |||
| 3888 | iounmap(il->hw_base); | 3887 | iounmap(il->hw_base); |
| 3889 | pci_release_regions(pdev); | 3888 | pci_release_regions(pdev); |
| 3890 | pci_disable_device(pdev); | 3889 | pci_disable_device(pdev); |
| 3891 | pci_set_drvdata(pdev, NULL); | ||
| 3892 | 3890 | ||
| 3893 | il_free_channel_map(il); | 3891 | il_free_channel_map(il); |
| 3894 | il_free_geos(il); | 3892 | il_free_geos(il); |
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 5ab50a5b48b1..3982ab76f375 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
| @@ -6706,7 +6706,6 @@ out_free_eeprom: | |||
| 6706 | out_iounmap: | 6706 | out_iounmap: |
| 6707 | iounmap(il->hw_base); | 6707 | iounmap(il->hw_base); |
| 6708 | out_pci_release_regions: | 6708 | out_pci_release_regions: |
| 6709 | pci_set_drvdata(pdev, NULL); | ||
| 6710 | pci_release_regions(pdev); | 6709 | pci_release_regions(pdev); |
| 6711 | out_pci_disable_device: | 6710 | out_pci_disable_device: |
| 6712 | pci_disable_device(pdev); | 6711 | pci_disable_device(pdev); |
| @@ -6787,7 +6786,6 @@ il4965_pci_remove(struct pci_dev *pdev) | |||
| 6787 | iounmap(il->hw_base); | 6786 | iounmap(il->hw_base); |
| 6788 | pci_release_regions(pdev); | 6787 | pci_release_regions(pdev); |
| 6789 | pci_disable_device(pdev); | 6788 | pci_disable_device(pdev); |
| 6790 | pci_set_drvdata(pdev, NULL); | ||
| 6791 | 6789 | ||
| 6792 | il4965_uninit_drv(il); | 6790 | il4965_uninit_drv(il); |
| 6793 | 6791 | ||