On 09/05/13 10:29, Sachin Kamat wrote:
> devm_iio_device_alloc makes code simpler.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/staging/iio/frequency/ad9850.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9850.c b/drivers/staging/iio/frequency/ad9850.c
> index 01a8a93..af877ff 100644
> --- a/drivers/staging/iio/frequency/ad9850.c
> +++ b/drivers/staging/iio/frequency/ad9850.c
> @@ -80,11 +80,9 @@ static int ad9850_probe(struct spi_device *spi)
> struct iio_dev *idev;
> int ret = 0;
>
> - idev = iio_device_alloc(sizeof(*st));
> - if (idev == NULL) {
> - ret = -ENOMEM;
> - goto error_ret;
> - }
> + idev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> + if (!idev)
> + return -ENOMEM;
> spi_set_drvdata(spi, idev);
> st = iio_priv(idev);
> mutex_init(&st->lock);
> @@ -96,24 +94,18 @@ static int ad9850_probe(struct spi_device *spi)
>
> ret = iio_device_register(idev);
> if (ret)
> - goto error_free_dev;
> + return ret;
> spi->max_speed_hz = 2000000;
> spi->mode = SPI_MODE_3;
> spi->bits_per_word = 16;
> spi_setup(spi);
>
> return 0;
> -
> -error_free_dev:
> - iio_device_free(idev);
> -error_ret:
> - return ret;
> }
>
> static int ad9850_remove(struct spi_device *spi)
> {
> iio_device_unregister(spi_get_drvdata(spi));
> - iio_device_free(spi_get_drvdata(spi));
>
> return 0;
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
