staging: iio: ad7152: Use devm_iio_device_alloc
Using devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
d15b73c5bf
commit
538ee7cbff
|
@ -481,11 +481,9 @@ static int ad7152_probe(struct i2c_client *client,
|
||||||
struct ad7152_chip_info *chip;
|
struct ad7152_chip_info *chip;
|
||||||
struct iio_dev *indio_dev;
|
struct iio_dev *indio_dev;
|
||||||
|
|
||||||
indio_dev = iio_device_alloc(sizeof(*chip));
|
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
|
||||||
if (indio_dev == NULL) {
|
if (!indio_dev)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto error_ret;
|
|
||||||
}
|
|
||||||
chip = iio_priv(indio_dev);
|
chip = iio_priv(indio_dev);
|
||||||
/* this is only used for device removal purposes */
|
/* this is only used for device removal purposes */
|
||||||
i2c_set_clientdata(client, indio_dev);
|
i2c_set_clientdata(client, indio_dev);
|
||||||
|
@ -506,16 +504,11 @@ static int ad7152_probe(struct i2c_client *client,
|
||||||
|
|
||||||
ret = iio_device_register(indio_dev);
|
ret = iio_device_register(indio_dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto error_free_dev;
|
return ret;
|
||||||
|
|
||||||
dev_err(&client->dev, "%s capacitive sensor registered\n", id->name);
|
dev_err(&client->dev, "%s capacitive sensor registered\n", id->name);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error_free_dev:
|
|
||||||
iio_device_free(indio_dev);
|
|
||||||
error_ret:
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ad7152_remove(struct i2c_client *client)
|
static int ad7152_remove(struct i2c_client *client)
|
||||||
|
@ -523,7 +516,6 @@ static int ad7152_remove(struct i2c_client *client)
|
||||||
struct iio_dev *indio_dev = i2c_get_clientdata(client);
|
struct iio_dev *indio_dev = i2c_get_clientdata(client);
|
||||||
|
|
||||||
iio_device_unregister(indio_dev);
|
iio_device_unregister(indio_dev);
|
||||||
iio_device_free(indio_dev);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue