evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: iio: ade7753: Use devm_iio_device_alloc

Browse source 
devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Barry Song <21cnbao@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-09-11 10:55:00 +01:00 • committed by Jonathan Cameron
parent 6bba7983bd
commit e7d4eb0e40
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/staging/iio/meter/ade7753.c
View file

@ -497,11 +497,9 @@ static int ade7753_probe(struct spi_device *spi)
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;
}
/* 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);
@ -517,19 +515,13 @@ static int ade7753_probe(struct spi_device *spi)
/* Get the device into a sane initial state */ /* Get the device into a sane initial state */
ret = ade7753_initial_setup(indio_dev); ret = ade7753_initial_setup(indio_dev);
if (ret) if (ret)
goto error_free_dev; return ret;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_free_dev; return ret;
return 0; return 0;
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret;
} }
/* fixme, confirm ordering in this function */ /* fixme, confirm ordering in this function */
@ -539,7 +531,6 @@ static int ade7753_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
ade7753_stop_device(&indio_dev->dev); ade7753_stop_device(&indio_dev->dev);
iio_device_free(indio_dev);
return 0; return 0;
} }