Commit f8e405d9 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

staging: iio: ad9850: Use devm_iio_device_alloc 



devm_iio_device_alloc makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent e3a27cc4

drivers/staging/iio/frequency/ad9850.c

+4 −12
Original line number Original line Diff line number Diff line
@@ -80,11 +80,9 @@ static int ad9850_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);

	mutex_init(&st->lock);

	mutex_init(&st->lock);
@@ -96,24 +94,18 @@ static int ad9850_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 ad9850_remove(struct spi_device *spi)

static int ad9850_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;

}

}