aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-03-12 03:44:05 -0400
committerSebastian Reichel <sre@kernel.org>2015-03-13 18:15:49 -0400
commit465c436b9e957c9db4770090e4c6086d97a6b893 (patch)
tree184a42fe1b7ef19ff125a5535d020dee6cc8cb3c /drivers/power
parentee8f334a9a467aba2c861a00be7c48dad549700a (diff)
power_supply: 88pm860x_charger: Use power_supply_*() API for accessing function attrs
Replace direct calls to power supply function attributes with wrappers. Wrappers provide safe access in case of unregistering the power supply (e.g. by removing the driver). Replace: - get_property -> power_supply_get_property - set_property -> power_supply_set_property Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> Acked-by: Pavel Machek <pavel@ucw.cz> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Reviewed-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/88pm860x_charger.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index ac352a6c03ea..98e31419d9cf 100644
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -296,12 +296,13 @@ static int set_charging_fsm(struct pm860x_charger_info *info)
296 psy = power_supply_get_by_name(pm860x_supplied_to[0]); 296 psy = power_supply_get_by_name(pm860x_supplied_to[0]);
297 if (!psy) 297 if (!psy)
298 return -EINVAL; 298 return -EINVAL;
299 ret = psy->get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &data); 299 ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,
300 &data);
300 if (ret) 301 if (ret)
301 return ret; 302 return ret;
302 vbatt = data.intval / 1000; 303 vbatt = data.intval / 1000;
303 304
304 ret = psy->get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data); 305 ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data);
305 if (ret) 306 if (ret)
306 return ret; 307 return ret;
307 308
@@ -430,7 +431,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data)
430 psy = power_supply_get_by_name(pm860x_supplied_to[0]); 431 psy = power_supply_get_by_name(pm860x_supplied_to[0]);
431 if (!psy) 432 if (!psy)
432 goto out; 433 goto out;
433 ret = psy->get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp); 434 ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);
434 if (ret) 435 if (ret)
435 goto out; 436 goto out;
436 value = temp.intval / 10; 437 value = temp.intval / 10;
@@ -485,7 +486,8 @@ static irqreturn_t pm860x_done_handler(int irq, void *data)
485 psy = power_supply_get_by_name(pm860x_supplied_to[0]); 486 psy = power_supply_get_by_name(pm860x_supplied_to[0]);
486 if (!psy) 487 if (!psy)
487 goto out; 488 goto out;
488 ret = psy->get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &val); 489 ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,
490 &val);
489 if (ret) 491 if (ret)
490 goto out; 492 goto out;
491 vbatt = val.intval / 1000; 493 vbatt = val.intval / 1000;
@@ -500,7 +502,8 @@ static irqreturn_t pm860x_done_handler(int irq, void *data)
500 if (ret < 0) 502 if (ret < 0)
501 goto out; 503 goto out;
502 if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG) 504 if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG)
503 psy->set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL, &val); 505 power_supply_set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL,
506 &val);
504 507
505out: 508out:
506 mutex_unlock(&info->lock); 509 mutex_unlock(&info->lock);