From: Jonathan Cameron <jic23@kernel.org>
To: Sachin Kamat <sachin.kamat@linaro.org>
Cc: linux-iio@vger.kernel.org, lars@metafoo.de
Subject: Re: [PATCH 04/12] staging: iio: ad9832: Use devm_* APIs
Date: Sat, 07 Sep 2013 22:01:26 +0100 [thread overview]
Message-ID: <522B9426.4050509@kernel.org> (raw)
In-Reply-To: <1378373397-22919-4-git-send-email-sachin.kamat@linaro.org>
On 09/05/13 10:29, Sachin Kamat wrote:
> devm_* APIs are device managed and make code simpler.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Applied to the togreg branch of iio.git
Thanks,
> ---
> drivers/staging/iio/frequency/ad9832.c | 32 ++++++++++++--------------------
> 1 file changed, 12 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
> index 4e18380..adc91b7 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -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;
> }
>
next prev parent reply other threads:[~2013-09-07 20:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 9:29 [PATCH 01/12] staging: iio: ad5933: Use devm_* APIs Sachin Kamat
2013-09-05 9:29 ` [PATCH 02/12] staging: iio: tsl2583: Use devm_iio_device_alloc Sachin Kamat
2013-09-07 20:59 ` Jonathan Cameron
2013-09-08 13:14 ` Sachin Kamat
2013-09-08 14:32 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 03/12] staging: iio: ad5930: " Sachin Kamat
2013-09-07 21:00 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 04/12] staging: iio: ad9832: Use devm_* APIs Sachin Kamat
2013-09-07 21:01 ` Jonathan Cameron [this message]
2013-09-05 9:29 ` [PATCH 05/12] staging: iio: ad9834: " Sachin Kamat
2013-09-07 21:02 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 06/12] staging: iio: ad9850: Use devm_iio_device_alloc Sachin Kamat
2013-09-07 21:02 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 07/12] staging: iio: ad9852: " Sachin Kamat
2013-09-07 21:03 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 08/12] staging: iio: ad9910: " Sachin Kamat
2013-09-07 21:03 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 09/12] staging: iio: ad9951: " Sachin Kamat
2013-09-07 21:04 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 10/12] staging: iio: tsl2x7x_core: Use devm_* APIs Sachin Kamat
2013-09-07 21:05 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 11/12] staging: iio: tsl2x7x_core: Fix sparse warning Sachin Kamat
2013-09-07 21:06 ` Jonathan Cameron
2013-09-05 9:29 ` [PATCH 12/12] staging: iio: hmc5843: Fix a trivial typo Sachin Kamat
2013-09-07 21:07 ` Jonathan Cameron
2013-09-07 20:53 ` [PATCH 01/12] staging: iio: ad5933: Use devm_* APIs Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=522B9426.4050509@kernel.org \
--to=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=sachin.kamat@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).