pm_runtime_put_autosuspend() will soon be changed to include a call to pm_runtime_mark_last_busy(). This patch switches the current users to __pm_runtime_put_autosuspend() which will continue to have the functionality of old pm_runtime_put_autosuspend(). Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> --- drivers/gpio/gpio-arizona.c | 10 +++++----- drivers/gpio/gpio-mxc.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c index c15fda99120a..692983da7949 100644 --- a/drivers/gpio/gpio-arizona.c +++ b/drivers/gpio/gpio-arizona.c @@ -40,7 +40,7 @@ static int arizona_gpio_direction_in(struct gpio_chip *chip, unsigned offset) if (change && persistent) { pm_runtime_mark_last_busy(chip->parent); - pm_runtime_put_autosuspend(chip->parent); + __pm_runtime_put_autosuspend(chip->parent); } return 0; @@ -63,7 +63,7 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset) ret = pm_runtime_get_sync(chip->parent); if (ret < 0) { dev_err(chip->parent, "Failed to resume: %d\n", ret); - pm_runtime_put_autosuspend(chip->parent); + __pm_runtime_put_autosuspend(chip->parent); return ret; } @@ -72,18 +72,18 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset) if (ret < 0) { dev_err(chip->parent, "Failed to drop cache: %d\n", ret); - pm_runtime_put_autosuspend(chip->parent); + __pm_runtime_put_autosuspend(chip->parent); return ret; } ret = regmap_read(arizona->regmap, reg, &val); if (ret < 0) { - pm_runtime_put_autosuspend(chip->parent); + __pm_runtime_put_autosuspend(chip->parent); return ret; } pm_runtime_mark_last_busy(chip->parent); - pm_runtime_put_autosuspend(chip->parent); + __pm_runtime_put_autosuspend(chip->parent); } if (val & ARIZONA_GPN_LVL) diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 4cb455b2bdee..ea7e7d28aa19 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -520,7 +520,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) list_add_tail(&port->node, &mxc_gpio_ports); platform_set_drvdata(pdev, port); - pm_runtime_put_autosuspend(&pdev->dev); + __pm_runtime_put_autosuspend(&pdev->dev); return 0; -- 2.39.5