iio: accel: da311: convert probe to device-managed functions

This is another simple conversion to device-managed functions, requiring
the use of devm_iio_device_register() and moving the disabling of the
device on a devm_add_action_or_reset() hook.

The i2c_set_clientdata() can be removed, as the PM functions can work with
just the device object, to obtain the i2c_client object.

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210630120338.482426-1-aardelean@deviqon.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/da311.c b/drivers/iio/accel/da311.c
index 92593a1..04e1348 100644 (file)
--- a/drivers/iio/accel/da311.c
+++ b/drivers/iio/accel/da311.c
@@ -212,6 +212,11 @@ static const struct iio_info da311_info = {
        .read_raw       = da311_read_raw,
 };
 
+static void da311_disable(void *client)
+{
+       da311_enable(client, false);
+}
+
 static int da311_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
@@ -229,7 +234,6 @@ static int da311_probe(struct i2c_client *client,
 
        data = iio_priv(indio_dev);
        data->client = client;
-       i2c_set_clientdata(client, indio_dev);
 
        indio_dev->info = &da311_info;
        indio_dev->name = "da311";
@@ -245,22 +249,11 @@ static int da311_probe(struct i2c_client *client,
        if (ret < 0)
                return ret;
 
-       ret = iio_device_register(indio_dev);
-       if (ret < 0) {
-               dev_err(&client->dev, "device_register failed\n");
-               da311_enable(client, false);
-       }
-
-       return ret;
-}
-
-static int da311_remove(struct i2c_client *client)
-{
-       struct iio_dev *indio_dev = i2c_get_clientdata(client);
-
-       iio_device_unregister(indio_dev);
+       ret = devm_add_action_or_reset(&client->dev, da311_disable, client);
+       if (ret)
+               return ret;
 
-       return da311_enable(client, false);
+       return devm_iio_device_register(&client->dev, indio_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -289,7 +282,6 @@ static struct i2c_driver da311_driver = {
                .pm = &da311_pm_ops,
        },
        .probe          = da311_probe,
-       .remove         = da311_remove,
        .id_table       = da311_i2c_id,
 };