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

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

staging: iio: ade7754: Use devm_iio_device_alloc 



devm_iio_device_alloc makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Barry Song <21cnbao@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent e7d4eb0e

drivers/staging/iio/meter/ade7754.c

+5 −14
Original line number Diff line number Diff line
@@ -520,11 +520,9 @@ static int ade7754_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);
@@ -540,18 +538,12 @@ static int ade7754_probe(struct spi_device *spi) 
	/* Get the device into a sane initial state */

	ret = ade7754_initial_setup(indio_dev);

	if (ret)

		goto error_free_dev;

		return ret;

	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_free_dev;

		return ret;



	return 0;



error_free_dev:

	iio_device_free(indio_dev);



error_ret:

	return ret;

}



/* fixme, confirm ordering in this function */
@@ -561,7 +553,6 @@ static int ade7754_remove(struct spi_device *spi) 


	iio_device_unregister(indio_dev);

	ade7754_stop_device(&indio_dev->dev);

	iio_device_free(indio_dev);



	return 0;

}