Commit 7e2bb83c authored by Linus Walleij's avatar Linus Walleij Committed by Sebastian Reichel
Browse files

power: supply: ab8500: Call battery population once 



The code was calling ab8500_bm_of_probe() in four different
spots effectively overwriting the same configuration three
times. This was done because probe order was uncertain.

Since we now used componentized probe, call it only once
while probing the main charging component.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 1c1f13a0

drivers/power/supply/ab8500_btemp.c

+0 −7
Original line number Diff line number Diff line
@@ -983,7 +983,6 @@ static const struct component_ops ab8500_btemp_component_ops = { 


static int ab8500_btemp_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct power_supply_config psy_cfg = {};

	struct device *dev = &pdev->dev;

	struct ab8500_btemp *di;
@@ -996,12 +995,6 @@ static int ab8500_btemp_probe(struct platform_device *pdev) 


	di->bm = &ab8500_bm_data;



	ret = ab8500_bm_of_probe(dev, np, di->bm);

	if (ret) {

		dev_err(dev, "failed to get battery information\n");

		return ret;

	}



	/* get parent data */

	di->dev = dev;

	di->parent = dev_get_drvdata(pdev->dev.parent);

drivers/power/supply/ab8500_fg.c

+0 −6
Original line number Diff line number Diff line
@@ -3058,12 +3058,6 @@ static int ab8500_fg_probe(struct platform_device *pdev) 


	di->bm = &ab8500_bm_data;



	ret = ab8500_bm_of_probe(dev, np, di->bm);

	if (ret) {

		dev_err(dev, "failed to get battery information\n");

		return ret;

	}



	mutex_init(&di->cc_lock);



	/* get parent data */

drivers/power/supply/abx500_chargalg.c

+0 −7
Original line number Diff line number Diff line
@@ -2002,7 +2002,6 @@ static const struct component_ops abx500_chargalg_component_ops = { 
static int abx500_chargalg_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct power_supply_config psy_cfg = {};

	struct abx500_chargalg *di;

	int ret = 0;
@@ -2013,12 +2012,6 @@ static int abx500_chargalg_probe(struct platform_device *pdev) 


	di->bm = &ab8500_bm_data;



	ret = ab8500_bm_of_probe(dev, np, di->bm);

	if (ret) {

		dev_err(dev, "failed to get battery information\n");

		return ret;

	}



	/* get device struct and parent */

	di->dev = dev;

	di->parent = dev_get_drvdata(pdev->dev.parent);