mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
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: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
parent
1c1f13a006
commit
7e2bb83c61
3 changed files with 0 additions and 20 deletions
|
@ -983,7 +983,6 @@ static const struct component_ops ab8500_btemp_component_ops = {
|
||||||
|
|
||||||
static int ab8500_btemp_probe(struct platform_device *pdev)
|
static int ab8500_btemp_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device_node *np = pdev->dev.of_node;
|
|
||||||
struct power_supply_config psy_cfg = {};
|
struct power_supply_config psy_cfg = {};
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct ab8500_btemp *di;
|
struct ab8500_btemp *di;
|
||||||
|
@ -996,12 +995,6 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
di->bm = &ab8500_bm_data;
|
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 */
|
/* get parent data */
|
||||||
di->dev = dev;
|
di->dev = dev;
|
||||||
di->parent = dev_get_drvdata(pdev->dev.parent);
|
di->parent = dev_get_drvdata(pdev->dev.parent);
|
||||||
|
|
|
@ -3058,12 +3058,6 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
di->bm = &ab8500_bm_data;
|
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);
|
mutex_init(&di->cc_lock);
|
||||||
|
|
||||||
/* get parent data */
|
/* get parent data */
|
||||||
|
|
|
@ -2002,7 +2002,6 @@ static const struct component_ops abx500_chargalg_component_ops = {
|
||||||
static int abx500_chargalg_probe(struct platform_device *pdev)
|
static int abx500_chargalg_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct device_node *np = dev->of_node;
|
|
||||||
struct power_supply_config psy_cfg = {};
|
struct power_supply_config psy_cfg = {};
|
||||||
struct abx500_chargalg *di;
|
struct abx500_chargalg *di;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -2013,12 +2012,6 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
di->bm = &ab8500_bm_data;
|
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 */
|
/* get device struct and parent */
|
||||||
di->dev = dev;
|
di->dev = dev;
|
||||||
di->parent = dev_get_drvdata(pdev->dev.parent);
|
di->parent = dev_get_drvdata(pdev->dev.parent);
|
||||||
|
|
Loading…
Reference in a new issue