summaryrefslogtreecommitdiffstats
path: root/drivers/iio/light/al3320a.c
diff options
context:
space:
mode:
authorDavid Heidelberg <david@ixit.cz>2020-02-11 20:12:00 +0100
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2020-03-08 18:28:35 +0100
commit3a271275fa747bafc931ddd872e51d0f3cb15828 (patch)
treecdd331062eda841652352e43a42cca79992a102f /drivers/iio/light/al3320a.c
parentiio: light: al3320a implement suspend support (diff)
downloadlinux-3a271275fa747bafc931ddd872e51d0f3cb15828.tar.xz
linux-3a271275fa747bafc931ddd872e51d0f3cb15828.zip
iio: light: al3320a implement devm_add_action_or_reset
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>
Diffstat (limited to 'drivers/iio/light/al3320a.c')
-rw-r--r--drivers/iio/light/al3320a.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index 2659a352b55e..8cec6841cefa 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(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,
};