Skip to contentSkip to conversation

net: wireless: remove unnecessary platform_set_drvdata()

PATCH Applied Jingoo Han 2 participants 2 messages May 28, 2013

Subsystems (4)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 3/4 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.

---
 drivers/net/wireless/ath/ath5k/ahb.c |    2 --
 drivers/net/wireless/ath/ath9k/ahb.c |    2 --
 2 files changed, 4 deletions(-)
drivers/net/wireless/ath/ath5k/ahb.c +0 -2
index 8e8bcc7a..e9bc9e6 100644
@@ -185,7 +185,6 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
  err_free_hw:
 	ieee80211_free_hw(hw);
-	platform_set_drvdata(pdev, NULL);
  err_iounmap:
         iounmap(mem);
  err_out:
@@ -221,7 +220,6 @@ static int ath_ahb_remove(struct platform_device *pdev)
 
 	ath5k_deinit_ah(ah);
 	iounmap(ah->iobase);
-	platform_set_drvdata(pdev, NULL);
 	ieee80211_free_hw(hw);
 
 	return 0;
drivers/net/wireless/ath/ath9k/ahb.c +0 -2
index d1ff3c2..072e4b5 100644
@@ -150,7 +150,6 @@ static int ath_ahb_probe(struct platform_device *pdev)
 	free_irq(irq, sc);
  err_free_hw:
 	ieee80211_free_hw(hw);
-	platform_set_drvdata(pdev, NULL);
 	return ret;
 }
 
@@ -164,7 +163,6 @@ static int ath_ahb_remove(struct platform_device *pdev)
 		ath9k_deinit_device(sc);
 		free_irq(sc->irq, sc);
 		ieee80211_free_hw(sc->hw);
-		platform_set_drvdata(pdev, NULL);
 	}
 
 	return 0;
Signature · 1 line
1.7.10.4
maintainer Applied
#1 lore raw

From: Jingoo Han <[email protected]>
Date: Tue, 28 May 2013 14:07:11 +0900

Quoted 6 lines

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.

Applied.