aboutsummaryrefslogtreecommitdiff
path: root/drivers/power/ab8500_fg.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-11-29 15:08:41 +0000
committerLee Jones <lee.jones@linaro.org>2012-12-11 08:43:54 +0000
commit23a04f9f40f2b32ee593b768483105b1c776814d (patch)
tree7c069255c0d34f30f2e3132dd5ce4a614de5ca29 /drivers/power/ab8500_fg.c
parentb0284de05e07d56ff7de154d0c9263788755f5eb (diff)
ab8500_bm: Always send platform specific battery information via pdata
Currently the AB8500 battery management subsystem receives platform specific information via two different means depending on how the platform is booted. If DT is not enabled, a reference to a *_bm_data data structure containing each platform specific attribute is passed though platform_data. However, if DT is enabled, then platform_data is empty and the reference is gained though a DT specific probe function. There are two issues here 1) the same reference is being collected each time and 2) the DT way doesn't allow any provisions to select different platform specific attributes, which kind of defeats the object. Cc: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/power/ab8500_fg.c')
-rw-r--r--drivers/power/ab8500_fg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 4cf231375de..8bb9df92627 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2460,7 +2460,7 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
di->bm = pdev->mfd_cell->platform_data;
if (!di->bm) {
if (np) {
- ret = ab8500_bm_of_probe(&pdev->dev, np, &di->bm);
+ ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm);
if (ret) {
dev_err(&pdev->dev,
"failed to get battery information\n");