mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 11:19:37 +00:00
Code Issues Releases Wiki Activity

ab8500_btemp: Reorder obtainment of platform specific battery management data

Browse source 
Now that we always pass platform specific battery management data
through platform_data instead of obtaining it via different means
depending the way be boot the system (DT or ATAGs); we need to
re-jiggle the way we acquire it in the driver start-up functions.
Now it is wrong for it to be missing, but we still allow Device
Tree code to fiddle with it once we've confirmed it's there.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Lee Jones 2012-11-30 10:48:30 +00:00
parent 23a04f9f40
commit 95820245ed
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/power/ab8500_btemp.c
View file

@ -976,6 +976,7 @@ static char *supply_interface[] = {
static int __devinit ab8500_btemp_probe(struct platform_device *pdev) static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct abx500_bm_data *plat = pdev->dev.platform_data;
struct ab8500_btemp *di; struct ab8500_btemp *di;
int irq, i, ret = 0; int irq, i, ret = 0;
u8 val; u8 val;
@ -985,21 +986,19 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "%s no mem for ab8500_btemp\n", __func__); dev_err(&pdev->dev, "%s no mem for ab8500_btemp\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
di->bm = pdev->mfd_cell->platform_data;
if (!di->bm) { if (!plat) {
if (np) { dev_err(&pdev->dev, "no battery management data supplied\n");
ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm); return -EINVAL;
if (ret) { }
dev_err(&pdev->dev, di->bm = plat;
"failed to get battery information\n");
return ret; if (np) {
} ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm);
} else { if (ret) {
dev_err(&pdev->dev, "missing dt node for ab8500_btemp\n"); dev_err(&pdev->dev, "failed to get battery information\n");
return -EINVAL; return ret;
} }
} else {
dev_info(&pdev->dev, "falling back to legacy platform data\n");
} }
/* get parent data */ /* get parent data */