diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-23 06:34:39 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-06-06 20:30:46 -0400 |
commit | e08358792422ef0b78d7c81f333fc0803fb41cd4 (patch) | |
tree | 95607db2cbcf276d498fb68d014d0ea47e173072 /drivers/power | |
parent | c509a62c9469e2787bcacc7aba454d555732b0b6 (diff) |
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.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/intel_mid_battery.c | 2 | ||||
-rw-r--r-- | drivers/power/tps65090-charger.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c index 18d136b443ee..4520811168ad 100644 --- a/drivers/power/intel_mid_battery.c +++ b/drivers/power/intel_mid_battery.c | |||
@@ -756,7 +756,7 @@ static int platform_pmic_battery_probe(struct platform_device *pdev) | |||
756 | 756 | ||
757 | static int platform_pmic_battery_remove(struct platform_device *pdev) | 757 | static int platform_pmic_battery_remove(struct platform_device *pdev) |
758 | { | 758 | { |
759 | struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev); | 759 | struct pmic_power_module_info *pbi = platform_get_drvdata(pdev); |
760 | 760 | ||
761 | free_irq(pbi->irq, pbi); | 761 | free_irq(pbi->irq, pbi); |
762 | cancel_delayed_work_sync(&pbi->monitor_battery); | 762 | cancel_delayed_work_sync(&pbi->monitor_battery); |
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c index 9fbca310a2ad..77ab8561fa34 100644 --- a/drivers/power/tps65090-charger.c +++ b/drivers/power/tps65090-charger.c | |||
@@ -218,7 +218,7 @@ static int tps65090_charger_probe(struct platform_device *pdev) | |||
218 | return -ENOMEM; | 218 | return -ENOMEM; |
219 | } | 219 | } |
220 | 220 | ||
221 | dev_set_drvdata(&pdev->dev, cdata); | 221 | platform_set_drvdata(pdev, cdata); |
222 | 222 | ||
223 | cdata->dev = &pdev->dev; | 223 | cdata->dev = &pdev->dev; |
224 | cdata->pdata = pdata; | 224 | cdata->pdata = pdata; |
@@ -291,7 +291,7 @@ fail_unregister_supply: | |||
291 | 291 | ||
292 | static int tps65090_charger_remove(struct platform_device *pdev) | 292 | static int tps65090_charger_remove(struct platform_device *pdev) |
293 | { | 293 | { |
294 | struct tps65090_charger *cdata = dev_get_drvdata(&pdev->dev); | 294 | struct tps65090_charger *cdata = platform_get_drvdata(pdev); |
295 | 295 | ||
296 | devm_free_irq(cdata->dev, cdata->irq, cdata); | 296 | devm_free_irq(cdata->dev, cdata->irq, cdata); |
297 | power_supply_unregister(&cdata->ac); | 297 | power_supply_unregister(&cdata->ac); |