Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: iio: adis16240: Use devm_iio_device_alloc 



Using 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 1868171c

drivers/staging/iio/accel/adis16240_core.c

+5 −11
Original line number Diff line number Diff line
@@ -236,11 +236,9 @@ static int adis16240_probe(struct spi_device *spi) 
	struct iio_dev *indio_dev;



	/* setup the industrialio driver allocated elements */

	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);

	/* this is only used for removal purposes */

	spi_set_drvdata(spi, indio_dev);
@@ -254,10 +252,10 @@ static int adis16240_probe(struct spi_device *spi) 


	ret = adis_init(st, indio_dev, spi, &adis16240_data);

	if (ret)

		goto error_free_dev;

		return ret;

	ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);

	if (ret)

		goto error_free_dev;

		return ret;



	/* Get the device into a sane initial state */

	ret = adis_initial_startup(st);
@@ -270,9 +268,6 @@ static int adis16240_probe(struct spi_device *spi) 


error_cleanup_buffer_trigger:

	adis_cleanup_buffer_and_trigger(st, indio_dev);

error_free_dev:

	iio_device_free(indio_dev);

error_ret:

	return ret;

}
@@ -283,7 +278,6 @@ static int adis16240_remove(struct spi_device *spi) 


	iio_device_unregister(indio_dev);

	adis_cleanup_buffer_and_trigger(st, indio_dev);

	iio_device_free(indio_dev);



	return 0;

}