On Tue, 11 Feb 2020 20:12:00 +0100
David Heidelberg <david@xxxxxxx> wrote:
> Use devm_add_action_or_reset to automatically disable the device
> and allow you to get rid of the remove function entirely.
>
> Signed-off-by: David Heidelberg <david@xxxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/light/al3320a.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
> index affa4c6c199a..49e73e24fff6 100644
> --- a/drivers/iio/light/al3320a.c
> +++ b/drivers/iio/light/al3320a.c
> @@ -87,6 +87,13 @@ static int al3320a_set_pwr(struct i2c_client *client, bool pwr)
> return i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, val);
> }
>
> +static void al3320a_set_pwr_off(void *_data)
> +{
> + struct al3320a_data *data = _data;
> +
> + al3320a_set_pwr(data->client, false);
> +}
> +
> static int al3320a_init(struct al3320a_data *data)
> {
> int ret;
> @@ -206,12 +213,14 @@ static int al3320a_probe(struct i2c_client *client,
> dev_err(&client->dev, "al3320a chip init failed\n");
> return ret;
> }
> - return devm_iio_device_register(&client->dev, indio_dev);
> -}
>
> -static int al3320a_remove(struct i2c_client *client)
> -{
> - return al3320a_set_pwr(client, false);
> + ret = devm_add_action_or_reset(&client->dev,
> + al3320a_set_pwr_off,
> + data);
> + if (ret < 0)
> + return ret;
> +
> + return devm_iio_device_register(&client->dev, indio_dev);
> }
>
> static int __maybe_unused al3320a_suspend(struct device *dev)
> @@ -238,7 +247,6 @@ static struct i2c_driver al3320a_driver = {
> .pm = &al3320a_pm_ops,
> },
> .probe = al3320a_probe,
> - .remove = al3320a_remove,
> .id_table = al3320a_id,
> };
>
