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

iio: dac: ad5686: Use devm_* APIs 



devm_* APIs are device managed and make code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 75238230

drivers/iio/dac/ad5686.c

+4 −13
Original line number Diff line number Diff line
@@ -314,18 +314,18 @@ static int ad5686_probe(struct spi_device *spi) 
	struct iio_dev *indio_dev;

	int ret, regdone = 0, voltage_uv = 0;



	indio_dev = iio_device_alloc(sizeof(*st));

	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));

	if (indio_dev == NULL)

		return  -ENOMEM;



	st = iio_priv(indio_dev);

	spi_set_drvdata(spi, indio_dev);



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

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

	if (!IS_ERR(st->reg)) {

		ret = regulator_enable(st->reg);

		if (ret)

			goto error_put_reg;

			return ret;



		ret = regulator_get_voltage(st->reg);

		if (ret < 0)
@@ -369,12 +369,6 @@ static int ad5686_probe(struct spi_device *spi) 
error_disable_reg:

	if (!IS_ERR(st->reg))

		regulator_disable(st->reg);

error_put_reg:

	if (!IS_ERR(st->reg))

		regulator_put(st->reg);



	iio_device_free(indio_dev);



	return ret;

}
@@ -384,11 +378,8 @@ static int ad5686_remove(struct spi_device *spi) 
	struct ad5686_state *st = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	if (!IS_ERR(st->reg)) {

	if (!IS_ERR(st->reg))

		regulator_disable(st->reg);

		regulator_put(st->reg);

	}

	iio_device_free(indio_dev);



	return 0;

}