Use devm_add_action_or_reset to call tsl2772_chip_off
when the device is removed.
This also fixes the issue that the chip is turned off
before the device is unregistered.

Fixes: 4e24c1719f34 ("staging: iio: tsl2x7x: rename driver to tsl2772")
Signed-off-by: Chuhong Yuan <hsleste...@gmail.com>
---
Changes in v4:
  - Split v3 into three patches.
  - Revise description to make it more precise.

 drivers/iio/light/tsl2772.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
index 29cfd8ae2700..e866ae40f157 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
@@ -1877,9 +1884,14 @@ static int tsl2772_probe(struct i2c_client *clientp,
        if (ret < 0)
                return ret;
 
+       ret = devm_add_action_or_reset(&clientp->dev,
+                                       tsl2772_chip_off_action,
+                                       indio_dev);
+       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__);
                return ret;
@@ -1926,8 +1938,6 @@ 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;
-- 
2.20.1

Reply via email to