From: Jonathan Cameron <jic23@kernel.org>
To: Sachin Kamat <sachin.kamat@linaro.org>
Cc: linux-iio@vger.kernel.org, Graff Yang <graff.yang@gmail.com>
Subject: Re: [PATCH 02/10] staging: iio: ad2s1200: Use devm_* APIs
Date: Sat, 14 Sep 2013 11:46:47 +0100 [thread overview]
Message-ID: <52343E97.3010400@kernel.org> (raw)
In-Reply-To: <1378893325-31764-2-git-send-email-sachin.kamat@linaro.org>
On 09/11/13 10:55, Sachin Kamat wrote:
> devm_* APIs are device managed and make code simpler.
> This patch also fixes the missing gpio_free call in remove.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Graff Yang <graff.yang@gmail.com>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/staging/iio/resolver/ad2s1200.c | 24 ++++++++----------------
> 1 file changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c
> index 7122116..76f6d65 100644
> --- a/drivers/staging/iio/resolver/ad2s1200.c
> +++ b/drivers/staging/iio/resolver/ad2s1200.c
> @@ -107,16 +107,16 @@ static int ad2s1200_probe(struct spi_device *spi)
> unsigned short *pins = spi->dev.platform_data;
>
> for (pn = 0; pn < AD2S1200_PN; pn++)
> - if (gpio_request_one(pins[pn], GPIOF_DIR_OUT, DRV_NAME)) {
> + ret = devm_gpio_request_one(&spi->dev, pins[pn], GPIOF_DIR_OUT,
> + DRV_NAME);
> + if (ret) {
> pr_err("%s: request gpio pin %d failed\n",
> DRV_NAME, pins[pn]);
> - goto error_ret;
> + return 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;
> spi_set_drvdata(spi, indio_dev);
> st = iio_priv(indio_dev);
> mutex_init(&st->lock);
> @@ -133,26 +133,18 @@ static int ad2s1200_probe(struct spi_device *spi)
>
> ret = iio_device_register(indio_dev);
> if (ret)
> - goto error_free_dev;
> + return ret;
>
> spi->max_speed_hz = AD2S1200_HZ;
> spi->mode = SPI_MODE_3;
> spi_setup(spi);
>
> return 0;
> -
> -error_free_dev:
> - iio_device_free(indio_dev);
> -error_ret:
> - for (--pn; pn >= 0; pn--)
> - gpio_free(pins[pn]);
> - return ret;
> }
>
> static int ad2s1200_remove(struct spi_device *spi)
> {
> iio_device_unregister(spi_get_drvdata(spi));
> - iio_device_free(spi_get_drvdata(spi));
>
> return 0;
> }
>
next prev parent reply other threads:[~2013-09-14 9:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 9:55 [PATCH 01/10] staging: iio: hmc5843: Use devm_iio_device_alloc Sachin Kamat
2013-09-11 9:55 ` [PATCH 02/10] staging: iio: ad2s1200: Use devm_* APIs Sachin Kamat
2013-09-14 10:46 ` Jonathan Cameron [this message]
2013-09-11 9:55 ` [PATCH 03/10] staging: iio: ad2s1200: Use dev_err instead of pr_err Sachin Kamat
2013-09-14 10:47 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 04/10] staging: iio: ad2s1210: Use devm_iio_device_alloc Sachin Kamat
2013-09-14 10:51 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 05/10] staging: iio: ad2s90: " Sachin Kamat
2013-09-14 10:56 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 06/10] staging: iio: ade7753: " Sachin Kamat
2013-09-14 10:56 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 07/10] staging: iio: ade7754: " Sachin Kamat
2013-09-11 9:55 ` [PATCH 08/10] staging: iio: ade7758_core: " Sachin Kamat
2013-09-14 10:56 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 09/10] staging: iio: ade7759: " Sachin Kamat
2013-09-14 10:57 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 10/10] staging: iio: ade7854: " Sachin Kamat
2013-09-14 11:00 ` Jonathan Cameron
2013-09-14 10:46 ` [PATCH 01/10] staging: iio: hmc5843: " 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=52343E97.3010400@kernel.org \
--to=jic23@kernel.org \
--cc=graff.yang@gmail.com \
--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).