iio: gyro: adis16130: Use devm_iio_device_alloc
Using devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Родитель
da419463d8
Коммит
42aceff5a2
|
@ -148,16 +148,13 @@ static const struct iio_info adis16130_info = {
|
||||||
|
|
||||||
static int adis16130_probe(struct spi_device *spi)
|
static int adis16130_probe(struct spi_device *spi)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
struct adis16130_state *st;
|
struct adis16130_state *st;
|
||||||
struct iio_dev *indio_dev;
|
struct iio_dev *indio_dev;
|
||||||
|
|
||||||
/* setup the industrialio driver allocated elements */
|
/* setup the industrialio driver allocated elements */
|
||||||
indio_dev = iio_device_alloc(sizeof(*st));
|
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
||||||
if (indio_dev == NULL) {
|
if (!indio_dev)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto error_ret;
|
|
||||||
}
|
|
||||||
st = iio_priv(indio_dev);
|
st = iio_priv(indio_dev);
|
||||||
/* this is only used for removal purposes */
|
/* this is only used for removal purposes */
|
||||||
spi_set_drvdata(spi, indio_dev);
|
spi_set_drvdata(spi, indio_dev);
|
||||||
|
@ -170,24 +167,12 @@ static int adis16130_probe(struct spi_device *spi)
|
||||||
indio_dev->info = &adis16130_info;
|
indio_dev->info = &adis16130_info;
|
||||||
indio_dev->modes = INDIO_DIRECT_MODE;
|
indio_dev->modes = INDIO_DIRECT_MODE;
|
||||||
|
|
||||||
ret = iio_device_register(indio_dev);
|
return iio_device_register(indio_dev);
|
||||||
if (ret)
|
|
||||||
goto error_free_dev;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
error_free_dev:
|
|
||||||
iio_device_free(indio_dev);
|
|
||||||
|
|
||||||
error_ret:
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int adis16130_remove(struct spi_device *spi)
|
static int adis16130_remove(struct spi_device *spi)
|
||||||
{
|
{
|
||||||
iio_device_unregister(spi_get_drvdata(spi));
|
iio_device_unregister(spi_get_drvdata(spi));
|
||||||
iio_device_free(spi_get_drvdata(spi));
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче