mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
staging: iio: ad2s90: Use devm_iio_device_alloc
devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Graff Yang <graff.yang@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
50711572c6
commit
6bba7983bd
1 changed files with 4 additions and 12 deletions
|
@ -64,11 +64,9 @@ static int ad2s90_probe(struct spi_device *spi)
|
|||
struct ad2s90_state *st;
|
||||
int ret = 0;
|
||||
|
||||
indio_dev = iio_device_alloc(sizeof(*st));
|
||||
if (indio_dev == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto error_ret;
|
||||
}
|
||||
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
||||
if (!indio_dev)
|
||||
return -ENOMEM;
|
||||
st = iio_priv(indio_dev);
|
||||
spi_set_drvdata(spi, indio_dev);
|
||||
|
||||
|
@ -83,7 +81,7 @@ static int ad2s90_probe(struct spi_device *spi)
|
|||
|
||||
ret = iio_device_register(indio_dev);
|
||||
if (ret)
|
||||
goto error_free_dev;
|
||||
return ret;
|
||||
|
||||
/* need 600ns between CS and the first falling edge of SCLK */
|
||||
spi->max_speed_hz = 830000;
|
||||
|
@ -91,17 +89,11 @@ static int ad2s90_probe(struct spi_device *spi)
|
|||
spi_setup(spi);
|
||||
|
||||
return 0;
|
||||
|
||||
error_free_dev:
|
||||
iio_device_free(indio_dev);
|
||||
error_ret:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ad2s90_remove(struct spi_device *spi)
|
||||
{
|
||||
iio_device_unregister(spi_get_drvdata(spi));
|
||||
iio_device_free(spi_get_drvdata(spi));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue