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

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

staging: iio: adis16220: 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 864bf5cd

drivers/staging/iio/accel/adis16220_core.c

+4 −10
Original line number Diff line number Diff line
@@ -428,11 +428,9 @@ static int adis16220_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 */
@@ -447,7 +445,7 @@ static int adis16220_probe(struct spi_device *spi) 


	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_free_dev;

		return ret;



	ret = sysfs_create_bin_file(&indio_dev->dev.kobj, &accel_bin);

	if (ret)
@@ -478,9 +476,6 @@ static int adis16220_probe(struct spi_device *spi) 
	sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);

error_unregister_dev:

	iio_device_unregister(indio_dev);

error_free_dev:

	iio_device_free(indio_dev);

error_ret:

	return ret;

}
@@ -492,7 +487,6 @@ static int adis16220_remove(struct spi_device *spi) 
	sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc1_bin);

	sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);

	iio_device_unregister(indio_dev);

	iio_device_free(indio_dev);



	return 0;

}