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

iio: adc: ad7476: Use devm_* APIs 



devm_* APIs are device managed and make 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 7abe9007

drivers/iio/adc/ad7476.c

+8 −18
Original line number Diff line number Diff line
@@ -213,24 +213,21 @@ static int ad7476_probe(struct spi_device *spi) 
	struct iio_dev *indio_dev;

	int ret;



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

	st->chip_info =

		&ad7476_chip_info_tbl[spi_get_device_id(spi)->driver_data];



	st->reg = regulator_get(&spi->dev, "vcc");

	if (IS_ERR(st->reg)) {

		ret = PTR_ERR(st->reg);

		goto error_free_dev;

	}

	st->reg = devm_regulator_get(&spi->dev, "vcc");

	if (IS_ERR(st->reg))

		return PTR_ERR(st->reg);



	ret = regulator_enable(st->reg);

	if (ret)

		goto error_put_reg;

		return ret;



	spi_set_drvdata(spi, indio_dev);
@@ -268,12 +265,7 @@ static int ad7476_probe(struct spi_device *spi) 
	iio_triggered_buffer_cleanup(indio_dev);

error_disable_reg:

	regulator_disable(st->reg);

error_put_reg:

	regulator_put(st->reg);

error_free_dev:

	iio_device_free(indio_dev);



error_ret:

	return ret;

}
@@ -285,8 +277,6 @@ static int ad7476_remove(struct spi_device *spi) 
	iio_device_unregister(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);

	regulator_disable(st->reg);

	regulator_put(st->reg);

	iio_device_free(indio_dev);



	return 0;

}