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

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

staging: iio: ad9832: 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 85bf6ee3

drivers/staging/iio/frequency/ad9832.c

+12 −20
Original line number Diff line number Diff line
@@ -214,14 +214,14 @@ static int ad9832_probe(struct spi_device *spi) 
		return -ENODEV;

	}



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

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

	if (!IS_ERR(reg)) {

		ret = regulator_enable(reg);

		if (ret)

			goto error_put_reg;

			return ret;

	}



	indio_dev = iio_device_alloc(sizeof(*st));

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

	if (indio_dev == NULL) {

		ret = -ENOMEM;

		goto error_disable_reg;
@@ -279,47 +279,42 @@ static int ad9832_probe(struct spi_device *spi) 
	ret = spi_sync(st->spi, &st->msg);

	if (ret) {

		dev_err(&spi->dev, "device init failed\n");

		goto error_free_device;

		goto error_disable_reg;

	}



	ret = ad9832_write_frequency(st, AD9832_FREQ0HM, pdata->freq0);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	ret = ad9832_write_frequency(st, AD9832_FREQ1HM, pdata->freq1);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	ret = ad9832_write_phase(st, AD9832_PHASE0H, pdata->phase0);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	ret = ad9832_write_phase(st, AD9832_PHASE1H, pdata->phase1);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	ret = ad9832_write_phase(st, AD9832_PHASE2H, pdata->phase2);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	ret = ad9832_write_phase(st, AD9832_PHASE3H, pdata->phase3);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_free_device;

		goto error_disable_reg;



	return 0;



error_free_device:

	iio_device_free(indio_dev);

error_disable_reg:

	if (!IS_ERR(reg))

		regulator_disable(reg);

error_put_reg:

	if (!IS_ERR(reg))

		regulator_put(reg);



	return ret;

}
@@ -330,11 +325,8 @@ static int ad9832_remove(struct spi_device *spi) 
	struct ad9832_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;

}