Re: [PATCH] arm64: defconfig: Enable cros-ec and battery driver

Jon Hunter
2016-05-25T11:04:00Z

On 25/05/16 11:58, Jon Hunter wrote:

...

> Looking at this a bit more I am wondering if we should prevent the
> battery for being polled before the registration has completed ...
>
> diff --git a/drivers/power/bq27xxx_battery.c
> b/drivers/power/bq27xxx_battery.c
> index 45f6ebf88df6..32649183ecd9 100644
> --- a/drivers/power/bq27xxx_battery.c
> +++ b/drivers/power/bq27xxx_battery.c
> @@ -871,12 +871,14 @@ static int bq27xxx_battery_get_property(struct
> power_supply *psy,
> int ret = 0;
> struct bq27xxx_device_info *di = power_supply_get_drvdata(psy);
>
> - mutex_lock(&di->lock);
> - if (time_is_before_jiffies(di->last_update + 5 * HZ)) {
> - cancel_delayed_work_sync(&di->work);
> - bq27xxx_battery_poll(&di->work.work);
> + if (di->bat) {
> + mutex_lock(&di->lock);
> + if (time_is_before_jiffies(di->last_update + 5 * HZ)) {
> + cancel_delayed_work_sync(&di->work);
> + bq27xxx_battery_poll(&di->work.work);
> + }
> + mutex_unlock(&di->lock);
> }
> - mutex_unlock(&di->lock);

Alternatively, maybe the following is simpler ...

diff --git a/drivers/power/bq27xxx_battery.c
b/drivers/power/bq27xxx_battery.c
index 45f6ebf88df6..8a713b52e9f6 100644
--- a/drivers/power/bq27xxx_battery.c
+++ b/drivers/power/bq27xxx_battery.c
@@ -733,7 +733,8 @@ static void bq27xxx_battery_poll(struct work_struct
*work)
container_of(work, struct bq27xxx_device_info,
work.work);

- bq27xxx_battery_update(di);
+ if (di->bat)
+ bq27xxx_battery_update(di);

Jon

--
nvpublic