diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:23 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:23 +0800 |
| commit | a05c58e73b23211d7b8d4ea31a0519ea41d4ec3c (patch) | |
| tree | b3aa7890aba1877b417e900994126bb0a6e2f359 /drivers/power/abx500_chargalg.c | |
| parent | 9ce0109275e82697ada4b005325e663ba72c3181 (diff) | |
| parent | f0bfbaaec3d8dfb06790c59bc5d6c848f0bbd5f8 (diff) | |
Merge topic branch 'core' into integration-linux-ux500
Diffstat (limited to 'drivers/power/abx500_chargalg.c')
| -rw-r--r-- | drivers/power/abx500_chargalg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c index 804b88c760d..032b27d35bf 100644 --- a/drivers/power/abx500_chargalg.c +++ b/drivers/power/abx500_chargalg.c @@ -220,6 +220,7 @@ enum maxim_ret { */ struct abx500_chargalg { struct device *dev; + struct ab8500 *parent; int charge_status; int eoc_cnt; int rch_cnt; @@ -1802,7 +1803,7 @@ static int __devexit abx500_chargalg_remove(struct platform_device *pdev) static int __devinit abx500_chargalg_probe(struct platform_device *pdev) { - struct abx500_bm_plat_data *plat_data; + struct ab8500_platform_data *plat_data; int ret = 0; struct abx500_chargalg *di = @@ -1812,8 +1813,8 @@ static int __devinit abx500_chargalg_probe(struct platform_device *pdev) /* get device struct */ di->dev = &pdev->dev; - - plat_data = pdev->dev.platform_data; + di->parent = dev_get_drvdata(pdev->dev.parent); + plat_data = dev_get_platdata(di->parent->dev); di->pdata = plat_data->chargalg; di->bat = plat_data->battery; |