Skip to contentSkip to conversation

power: use platform_{get,set}_drvdata()

PATCH Applied Jingoo Han 2 participants 2 messages May 23, 2013 – Jun 7, 2013

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 power: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device.

---
 drivers/power/intel_mid_battery.c |    2 +-
 drivers/power/tps65090-charger.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/power/intel_mid_battery.c +1 -1
index 18d136b..4520811 100644
@@ -756,7 +756,7 @@ static int platform_pmic_battery_probe(struct platform_device *pdev)
 
 static int platform_pmic_battery_remove(struct platform_device *pdev)
 {
-	struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);
+	struct pmic_power_module_info *pbi = platform_get_drvdata(pdev);
 
 	free_irq(pbi->irq, pbi);
 	cancel_delayed_work_sync(&pbi->monitor_battery);
drivers/power/tps65090-charger.c +2 -2
index 9fbca31..77ab856 100644
@@ -218,7 +218,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	dev_set_drvdata(&pdev->dev, cdata);
+	platform_set_drvdata(pdev, cdata);
 
 	cdata->dev			= &pdev->dev;
 	cdata->pdata			= pdata;
@@ -291,7 +291,7 @@ fail_unregister_supply:
 
 static int tps65090_charger_remove(struct platform_device *pdev)
 {
-	struct tps65090_charger *cdata = dev_get_drvdata(&pdev->dev);
+	struct tps65090_charger *cdata = platform_get_drvdata(pdev);
 
 	devm_free_irq(cdata->dev, cdata->irq, cdata);
 	power_supply_unregister(&cdata->ac);
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 6 lines · Jingoo Han

Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device.

---

Applied, thanks!

Anton