iio: light: al3320a implement devm_add_action_or_reset
authorDavid Heidelberg <david@ixit.cz>
Tue, 11 Feb 2020 19:12:00 +0000 (20:12 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 8 Mar 2020 17:28:35 +0000 (17:28 +0000)
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@ixit.cz>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/light/al3320a.c

index 2659a352b55e65aa9590d03f6289bcbeb5bef35d..8cec6841cefa0445c1a0cd11598c32e760624de5 100644 (file)
@@ -87,6 +87,13 @@ static int al3320a_set_pwr(struct i2c_client *client, bool pwr)
        return i2c_smbus_write_byte_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,
 };