FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-20 08:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iio: dac: ad5755: Use devm_iio_device_alloc

Browse Source 
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:
Sachin Kamat 2013-08-19 12:38:00 +01:00 committed by Jonathan Cameron
parent edf3fd4141
commit fd047294e2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/iio/dac/ad5755.c
View File

@ -565,7 +565,7 @@ static int ad5755_probe(struct spi_device *spi)
struct ad5755_state *st; struct ad5755_state *st;
int ret; int ret;
indio_dev = iio_device_alloc(sizeof(*st)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL) { if (indio_dev == NULL) {
dev_err(&spi->dev, "Failed to allocate iio device\n"); dev_err(&spi->dev, "Failed to allocate iio device\n");
return -ENOMEM; return -ENOMEM;
@ -589,24 +589,19 @@ static int ad5755_probe(struct spi_device *spi)
ret = ad5755_init_channels(indio_dev, pdata); ret = ad5755_init_channels(indio_dev, pdata);
if (ret) if (ret)
goto error_free; return ret;
ret = ad5755_setup_pdata(indio_dev, pdata); ret = ad5755_setup_pdata(indio_dev, pdata);
if (ret) if (ret)
goto error_free; return ret;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) { if (ret) {
dev_err(&spi->dev, "Failed to register iio device: %d\n", ret); dev_err(&spi->dev, "Failed to register iio device: %d\n", ret);
goto error_free; return ret;
} }
return 0; return 0;
error_free:
iio_device_free(indio_dev);
return ret;
} }
static int ad5755_remove(struct spi_device *spi) static int ad5755_remove(struct spi_device *spi)
@ -614,7 +609,6 @@ static int ad5755_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_device_free(indio_dev);
return 0; return 0;
} }