2013-05-23 10:34:42

by Jingoo Han

Subject: [PATCH] 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 <[email protected]>
---
drivers/power/intel_mid_battery.c | 2 +-
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 18d136b..4520811 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)

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);
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 9fbca31..77ab856 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)
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);
--
1.7.10.4

2013-06-07 00:37:01

by Anton Vorontsov

Subject: Re: [PATCH] power: use platform_{get,set}_drvdata()

On Thu, May 23, 2013 at 07:34:39PM +0900, Jingoo Han wrote:
> 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 <[email protected]>
> ---

Applied, thanks!

Anton