2011-04-18 14:11:13

by Haojian Zhuang

Subject: [PATCH 11/14] power_supply: max8925: use platform_data from cell

Avoid to get platform_data from parent device. Get it from mfd cell
device instead.

Signed-off-by: Haojian Zhuang <[email protected]>
Cc: Anton Vorontsov <[email protected]>
Cc: David Woodhouse <[email protected]>
---
drivers/power/max8925_power.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index 8e5aec2..a70e16d 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -425,16 +425,11 @@ static __devexit int max8925_deinit_charger(struct max8925_power_info *info)
static __devinit int max8925_power_probe(struct platform_device *pdev)
{
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
- struct max8925_platform_data *max8925_pdata;
struct max8925_power_pdata *pdata = NULL;
struct max8925_power_info *info;
int ret;

- if (pdev->dev.parent->platform_data) {
- max8925_pdata = pdev->dev.parent->platform_data;
- pdata = max8925_pdata->power;
- }
-
+ pdata = pdev->dev.platform_data;
if (!pdata) {
dev_err(&pdev->dev, "platform data isn't assigned to "
"power supply\n");
@@ -447,6 +442,7 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)
info->chip = chip;
info->gpm = chip->i2c;
info->adc = chip->adc;
+ platform_set_drvdata(pdev, info);

info->ac.name = "max8925-ac";
info->ac.type = POWER_SUPPLY_TYPE_MAINS;
@@ -482,8 +478,6 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)
info->topoff_threshold = pdata->topoff_threshold;
info->fast_charge = pdata->fast_charge;
info->set_charger = pdata->set_charger;
- dev_set_drvdata(&pdev->dev, info);
- platform_set_drvdata(pdev, info);

max8925_init_charger(chip, info);
return 0;
--
1.5.6.5

2011-04-18 21:49:29

by Anton Vorontsov

Subject: Re: [PATCH 11/14] power_supply: max8925: use platform_data from cell

On Mon, Apr 18, 2011 at 10:04:08PM +0800, Haojian Zhuang wrote:
> Avoid to get platform_data from parent device. Get it from mfd cell
> device instead.
>
> Signed-off-by: Haojian Zhuang <[email protected]>
> Cc: Anton Vorontsov <[email protected]>
> Cc: David Woodhouse <[email protected]>
> ---

Acked-by: Anton Vorontsov <[email protected]>

Thanks,

--
Anton Vorontsov
Email: [email protected]

2011-05-02 15:15:20

by Samuel Ortiz

Subject: Re: [PATCH 11/14] power_supply: max8925: use platform_data from cell

Hi Haojian, Anton,

On Tue, Apr 19, 2011 at 01:49:19AM +0400, Anton Vorontsov wrote:
> On Mon, Apr 18, 2011 at 10:04:08PM +0800, Haojian Zhuang wrote:
> > Avoid to get platform_data from parent device. Get it from mfd cell
> > device instead.
> >
> > Signed-off-by: Haojian Zhuang <[email protected]>
> > Cc: Anton Vorontsov <[email protected]>
> > Cc: David Woodhouse <[email protected]>
> > ---
>
> Acked-by: Anton Vorontsov <[email protected]>
Thanks, patch applied to my for-next branch.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/