On Wed, 31 Jul 2019 11:04:15 +0800
Chuhong Yuan <hslester96@xxxxxxxxx> wrote:
> Use devm_() APIs to simplify the code.
>
> Signed-off-by: Chuhong Yuan <hslester96@xxxxxxxxx>
> ---
> Changes in v3:
> - Split v2 into two patches.
>
> drivers/iio/light/tsl2772.c | 36 +++++++++++++++---------------------
> 1 file changed, 15 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
> index 83cece921843..f1134f183be7 100644
> --- a/drivers/iio/light/tsl2772.c
> +++ b/drivers/iio/light/tsl2772.c
> @@ -860,6 +860,13 @@ static int tsl2772_chip_off(struct iio_dev *indio_dev)
> return tsl2772_write_control_reg(chip, 0x00);
> }
>
> +static void tsl2772_chip_off_action(void *data)
> +{
> + struct iio_dev *indio_dev = data;
> +
> + tsl2772_chip_off(indio_dev);
> +}
> +
> /**
> * tsl2772_invoke_change - power cycle the device to implement the user
> * parameters
> @@ -1807,10 +1814,10 @@ static int tsl2772_probe(struct i2c_client *clientp,
> return PTR_ERR(chip->vdd_supply);
> }
>
> - ret = devm_add_action(&clientp->dev, tsl2772_disable_regulators_action,
> + ret = devm_add_action_or_reset(&clientp->dev,
> + tsl2772_disable_regulators_action,
Please fix that alignment in here.
Thanks,
Jonathan
> chip);
> if (ret < 0) {
> - tsl2772_disable_regulators_action(chip);
> dev_err(&clientp->dev, "Failed to setup regulator cleanup action %d\n",
> ret);
> return ret;
> @@ -1877,15 +1884,14 @@ static int tsl2772_probe(struct i2c_client *clientp,
> if (ret < 0)
> return ret;
>
> - ret = iio_device_register(indio_dev);
> - if (ret) {
> - tsl2772_chip_off(indio_dev);
> - dev_err(&clientp->dev,
> - "%s: iio registration failed\n", __func__);
> + ret = devm_add_action_or_reset(&clientp->dev,
> + tsl2772_chip_off_action,
> + indio_dev);
> +
> + if (ret < 0)
> return ret;
> - }
>
> - return 0;
> + return devm_iio_device_register(&clientp->dev, indio_dev);
> }
>
> static int tsl2772_suspend(struct device *dev)
> @@ -1922,17 +1928,6 @@ static int tsl2772_resume(struct device *dev)
> return tsl2772_chip_on(indio_dev);
> }
>
> -static int tsl2772_remove(struct i2c_client *client)
> -{
> - struct iio_dev *indio_dev = i2c_get_clientdata(client);
> -
> - tsl2772_chip_off(indio_dev);
> -
> - iio_device_unregister(indio_dev);
> -
> - return 0;
> -}
> -
> static const struct i2c_device_id tsl2772_idtable[] = {
> { "tsl2571", tsl2571 },
> { "tsl2671", tsl2671 },
> @@ -1979,7 +1974,6 @@ static struct i2c_driver tsl2772_driver = {
> },
> .id_table = tsl2772_idtable,
> .probe = tsl2772_probe,
> - .remove = tsl2772_remove,
> };
>
> module_i2c_driver(tsl2772_driver);
