diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-05-27 15:07:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-28 01:34:52 -0400 |
| commit | 785ec305b26ee23e0efb834b5cd0dd24070ba1bf (patch) | |
| tree | fc071d2707f1e748fa2f7a177e06e8ebd4fa1bb0 | |
| parent | bf3a33cec8d8b380647c9bbf17439e0c1695ba43 (diff) | |
net: wireless: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
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>
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/ahb.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ahb.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c index 8e8bcc7a4805..e9bc9e616b69 100644 --- a/drivers/net/wireless/ath/ath5k/ahb.c +++ b/drivers/net/wireless/ath/ath5k/ahb.c | |||
| @@ -185,7 +185,6 @@ static int ath_ahb_probe(struct platform_device *pdev) | |||
| 185 | 185 | ||
| 186 | err_free_hw: | 186 | err_free_hw: |
| 187 | ieee80211_free_hw(hw); | 187 | ieee80211_free_hw(hw); |
| 188 | platform_set_drvdata(pdev, NULL); | ||
| 189 | err_iounmap: | 188 | err_iounmap: |
| 190 | iounmap(mem); | 189 | iounmap(mem); |
| 191 | err_out: | 190 | err_out: |
| @@ -221,7 +220,6 @@ static int ath_ahb_remove(struct platform_device *pdev) | |||
| 221 | 220 | ||
| 222 | ath5k_deinit_ah(ah); | 221 | ath5k_deinit_ah(ah); |
| 223 | iounmap(ah->iobase); | 222 | iounmap(ah->iobase); |
| 224 | platform_set_drvdata(pdev, NULL); | ||
| 225 | ieee80211_free_hw(hw); | 223 | ieee80211_free_hw(hw); |
| 226 | 224 | ||
| 227 | return 0; | 225 | return 0; |
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index d1ff3c246a12..072e4b531067 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c | |||
| @@ -150,7 +150,6 @@ static int ath_ahb_probe(struct platform_device *pdev) | |||
| 150 | free_irq(irq, sc); | 150 | free_irq(irq, sc); |
| 151 | err_free_hw: | 151 | err_free_hw: |
| 152 | ieee80211_free_hw(hw); | 152 | ieee80211_free_hw(hw); |
| 153 | platform_set_drvdata(pdev, NULL); | ||
| 154 | return ret; | 153 | return ret; |
| 155 | } | 154 | } |
| 156 | 155 | ||
| @@ -164,7 +163,6 @@ static int ath_ahb_remove(struct platform_device *pdev) | |||
| 164 | ath9k_deinit_device(sc); | 163 | ath9k_deinit_device(sc); |
| 165 | free_irq(sc->irq, sc); | 164 | free_irq(sc->irq, sc); |
| 166 | ieee80211_free_hw(sc->hw); | 165 | ieee80211_free_hw(sc->hw); |
| 167 | platform_set_drvdata(pdev, NULL); | ||
| 168 | } | 166 | } |
| 169 | 167 | ||
| 170 | return 0; | 168 | return 0; |
