niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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/20210630121509.653717-1-aardelean@deviqon.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Alexandru Ardelean 2021-06-30 15:15:09 +03:00 • committed by Jonathan Cameron
parent 148da125a0
commit 689f584b98
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/iio/accel/dmard10.c
View file

@ -170,6 +170,11 @@ static const struct iio_info dmard10_info = {
.read_raw = dmard10_read_raw, .read_raw = dmard10_read_raw,
}; };
static void dmard10_shutdown_cleanup(void *client)
{
dmard10_shutdown(client);
}
static int dmard10_probe(struct i2c_client *client, static int dmard10_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
@ -194,7 +199,6 @@ static int dmard10_probe(struct i2c_client *client,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
data->client = client; data->client = client;
i2c_set_clientdata(client, indio_dev);
indio_dev->info = &dmard10_info; indio_dev->info = &dmard10_info;
indio_dev->name = "dmard10"; indio_dev->name = "dmard10";
@ -206,22 +210,12 @@ static int dmard10_probe(struct i2c_client *client,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = iio_device_register(indio_dev); ret = devm_add_action_or_reset(&client->dev, dmard10_shutdown_cleanup,
if (ret < 0) { client);
dev_err(&client->dev, "device_register failed\n"); if (ret)
dmard10_shutdown(client); return ret;
}
return ret; return devm_iio_device_register(&client->dev, indio_dev);
}
static int dmard10_remove(struct i2c_client *client)
{
struct iio_dev *indio_dev = i2c_get_clientdata(client);
iio_device_unregister(indio_dev);
return dmard10_shutdown(client);
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -250,7 +244,6 @@ static struct i2c_driver dmard10_driver = {
.pm = &dmard10_pm_ops, .pm = &dmard10_pm_ops,
}, },
.probe = dmard10_probe, .probe = dmard10_probe,
.remove = dmard10_remove,
.id_table = dmard10_i2c_id, .id_table = dmard10_i2c_id,
}; };