On 3/27/23 16:57, Benjamin Bara wrote:
> From: Benjamin Bara <benjamin.bara@xxxxxxxxxxx>
>
> Convert the power off handler to a devm-based power off handler.
>
> Signed-off-by: Benjamin Bara <benjamin.bara@xxxxxxxxxxx>
> ---
> drivers/mfd/tps6586x.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index 2d947f3f606a..93f1bf440191 100644
> --- a/drivers/mfd/tps6586x.c
> +++ b/drivers/mfd/tps6586x.c
> @@ -22,6 +22,7 @@
> #include <linux/err.h>
> #include <linux/i2c.h>
> #include <linux/platform_device.h>
> +#include <linux/reboot.h>
> #include <linux/regmap.h>
> #include <linux/of.h>
>
> @@ -457,13 +458,16 @@ static const struct regmap_config tps6586x_regmap_config = {
> .cache_type = REGCACHE_RBTREE,
> };
>
> -static struct device *tps6586x_dev;
> -static void tps6586x_power_off(void)
> +static int tps6586x_power_off_handler(struct sys_off_data *data)
> {
> - if (tps6586x_clr_bits(tps6586x_dev, TPS6586X_SUPPLYENE, EXITSLREQ_BIT))
> - return;
> + struct device *tps6586x_dev = data->cb_data;
> + int ret;
> +
> + ret = tps6586x_clr_bits(tps6586x_dev, TPS6586X_SUPPLYENE, EXITSLREQ_BIT);
> + if (ret)
> + return ret;
>
> - tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
> + return tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
> }
>
> static void tps6586x_print_version(struct i2c_client *client, int version)
> @@ -559,9 +563,13 @@ static int tps6586x_i2c_probe(struct i2c_client *client)
> goto err_add_devs;
> }
>
> - if (pdata->pm_off && !pm_power_off) {
> - tps6586x_dev = &client->dev;
> - pm_power_off = tps6586x_power_off;
> + if (pdata->pm_off) {
> + ret = devm_register_power_off_handler(&client->dev, &tps6586x_power_off_handler,
> + &client->dev);
> + if (ret) {
> + dev_err(&client->dev, "register power off handler failed: %d\n", ret);
> + goto err_add_devs;
> + }
> }
>
> return 0;
>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
--
Best regards,
Dmitry
