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

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

iio: gyro: adis16060_core: Use devm_iio_device_alloc 



Using devm_iio_device_alloc makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7a842ed6

drivers/staging/iio/gyro/adis16060_core.c

+4 −13
Original line number Diff line number Diff line
@@ -151,11 +151,9 @@ static int adis16060_r_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;

	/* this is only used for removal purposes */

	spi_set_drvdata(spi, indio_dev);

	st = iio_priv(indio_dev);
@@ -171,23 +169,16 @@ static int adis16060_r_probe(struct spi_device *spi) 


	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_free_dev;

		return ret;



	adis16060_iio_dev = indio_dev;

	return 0;



error_free_dev:

	iio_device_free(indio_dev);

error_ret:

	return ret;

}



/* fixme, confirm ordering in this function */

static int adis16060_r_remove(struct spi_device *spi)

{

	iio_device_unregister(spi_get_drvdata(spi));

	iio_device_free(spi_get_drvdata(spi));



	return 0;

}