On Wed, Jan 11, 2017 at 4:41 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote:
> We can get quite a few interrupts when the battery is trickle charging.
> Let's enable PM runtime autosuspend to avoid constantly toggling device
> state.
>
> Let's use a 600 ms timeout as that's how long the USB chager detection
> might take.
>
> Cc: Mark A. Greer <mgreer@xxxxxxxxxxxxxxx>
> Cc: Matt Ranostay <matt@ranostay.consulting>
> Cc: Liam Breck <kernel@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> drivers/power/supply/bq24190_charger.c | 101 ++++++++++++++++++++++++++-------
> 1 file changed, 81 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c
> --- a/drivers/power/supply/bq24190_charger.c
> +++ b/drivers/power/supply/bq24190_charger.c
> @@ -420,6 +420,7 @@ static ssize_t bq24190_sysfs_show(struct device *dev,
> struct power_supply *psy = dev_get_drvdata(dev);
> struct bq24190_dev_info *bdi = power_supply_get_drvdata(psy);
> struct bq24190_sysfs_field_info *info;
> + ssize_t count;
> int ret;
> u8 v;
>
> @@ -427,11 +428,20 @@ static ssize_t bq24190_sysfs_show(struct device *dev,
> if (!info)
> return -EINVAL;
>
> + ret = pm_runtime_get_sync(bdi->dev);
> + if (ret < 0)
> + return ret;
> +
> ret = bq24190_read_mask(bdi, info->reg, info->mask, info->shift, &v);
> if (ret)
> - return ret;
> + count = ret;
> + else
> + count = scnprintf(buf, PAGE_SIZE, "%hhx\n", v);
> +
> + pm_runtime_mark_last_busy(bdi->dev);
> + pm_runtime_put_autosuspend(bdi->dev);
>
> - return scnprintf(buf, PAGE_SIZE, "%hhx\n", v);
> + return count;
> }
>
> static ssize_t bq24190_sysfs_store(struct device *dev,
> @@ -451,9 +461,16 @@ static ssize_t bq24190_sysfs_store(struct device *dev,
> if (ret < 0)
> return ret;
>
> + ret = pm_runtime_get_sync(bdi->dev);
> + if (ret < 0)
> + return ret;
> +
> ret = bq24190_write_mask(bdi, info->reg, info->mask, info->shift, v);
> if (ret)
> - return ret;
> + count = ret;
> +
> + pm_runtime_mark_last_busy(bdi->dev);
> + pm_runtime_put_autosuspend(bdi->dev);
>
> return count;
> }
> @@ -795,7 +812,9 @@ static int bq24190_charger_get_property(struct power_supply *psy,
>
> dev_dbg(bdi->dev, "prop: %d\n", psp);
>
> - pm_runtime_get_sync(bdi->dev);
> + ret = pm_runtime_get_sync(bdi->dev);
> + if (ret < 0)
> + return ret;
>
> switch (psp) {
> case POWER_SUPPLY_PROP_CHARGE_TYPE:
> @@ -835,7 +854,9 @@ static int bq24190_charger_get_property(struct power_supply *psy,
> ret = -ENODATA;
> }
>
> - pm_runtime_put_sync(bdi->dev);
> + pm_runtime_mark_last_busy(bdi->dev);
> + pm_runtime_put_autosuspend(bdi->dev);
> +
> return ret;
> }
>
> @@ -848,7 +869,9 @@ static int bq24190_charger_set_property(struct power_supply *psy,
>
> dev_dbg(bdi->dev, "prop: %d\n", psp);
>
> - pm_runtime_get_sync(bdi->dev);
> + ret = pm_runtime_get_sync(bdi->dev);
> + if (ret < 0)
> + return ret;
>
> switch (psp) {
> case POWER_SUPPLY_PROP_CHARGE_TYPE:
> @@ -864,7 +887,9 @@ static int bq24190_charger_set_property(struct power_supply *psy,
> ret = -EINVAL;
> }
>
> - pm_runtime_put_sync(bdi->dev);
> + pm_runtime_mark_last_busy(bdi->dev);
> + pm_runtime_put_autosuspend(bdi->dev);
> +
> return ret;
> }
>
> @@ -1065,7 +1090,9 @@ static int bq24190_battery_get_property(struct power_supply *psy,
>
> dev_dbg(bdi->dev, "prop: %d\n", psp);
>
> - pm_runtime_get_sync(bdi->dev);
> + ret = pm_runtime_get_sync(bdi->dev);
> + if (ret < 0)
> + return ret;
>
> switch (psp) {
> case POWER_SUPPLY_PROP_STATUS:
> @@ -1093,7 +1120,9 @@ static int bq24190_battery_get_property(struct power_supply *psy,
> ret = -ENODATA;
> }
>
> - pm_runtime_put_sync(bdi->dev);
> + pm_runtime_mark_last_busy(bdi->dev);
> + pm_runtime_put_autosuspend(bdi->dev);
> +
> return ret;
> }
>
> @@ -1119,7 +1148,9 @@ static int bq24190_battery_set_property(struct power_supply *psy,
> ret = -EINVAL;
> }
pm_runtime_get_sync() in this function needs its return value checked.
> - pm_runtime_put_sync(bdi->dev);
> + pm_runtime_mark_last_busy(bdi->dev);
> + pm_runtime_put_autosuspend(bdi->dev);
> +
> return ret;
> }
Please submit this and #5 as a separate patchset after I resubmit 1-4.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
