hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: iio: ad5930: Use devm_iio_device_alloc 

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-09-05 10:29:00 +01:00 committed by Jonathan Cameron
parent 664716aeda
commit 85bf6ee365
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/iio/frequency/ad5930.c
View File

@ -94,11 +94,9 @@ static int ad5930_probe(struct spi_device *spi)
struct iio_dev *idev; struct iio_dev *idev;
int ret = 0; int ret = 0;
idev = iio_device_alloc(sizeof(*st)); idev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (idev == NULL) { if (!idev)
ret = -ENOMEM; return -ENOMEM;
goto error_ret;
}
spi_set_drvdata(spi, idev); spi_set_drvdata(spi, idev);
st = iio_priv(idev); st = iio_priv(idev);
@ -110,24 +108,18 @@ static int ad5930_probe(struct spi_device *spi)
ret = iio_device_register(idev); ret = iio_device_register(idev);
if (ret) if (ret)
goto error_free_dev; return ret;
spi->max_speed_hz = 2000000; spi->max_speed_hz = 2000000;
spi->mode = SPI_MODE_3; spi->mode = SPI_MODE_3;
spi->bits_per_word = 16; spi->bits_per_word = 16;
spi_setup(spi); spi_setup(spi);
return 0; return 0;
error_free_dev:
iio_device_free(idev);
error_ret:
return ret;
} }
static int ad5930_remove(struct spi_device *spi) static int ad5930_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;
} }