From: Jonathan Cameron <jic23@kernel.org>
To: Sachin Kamat <sachin.kamat@linaro.org>
Cc: linux-iio@vger.kernel.org, Barry Song <21cnbao@gmail.com>
Subject: Re: [PATCH 10/10] staging: iio: ade7854: Use devm_iio_device_alloc
Date: Sat, 14 Sep 2013 12:00:15 +0100 [thread overview]
Message-ID: <523441BF.7020103@kernel.org> (raw)
In-Reply-To: <1378893325-31764-10-git-send-email-sachin.kamat@linaro.org>
On 09/11/13 10:55, Sachin Kamat wrote:
> devm_iio_device_alloc makes code simpler.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Barry Song <21cnbao@gmail.com>
Applied with a little fuzz to the togreg branch of iio.git
(due to some string handling updates that went in recently)
> ---
> drivers/staging/iio/meter/ade7854-i2c.c | 4 +---
> drivers/staging/iio/meter/ade7854-spi.c | 4 +---
> drivers/staging/iio/meter/ade7854.c | 6 +-----
> 3 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c
> index db9ef6c..5b33c7f 100644
> --- a/drivers/staging/iio/meter/ade7854-i2c.c
> +++ b/drivers/staging/iio/meter/ade7854-i2c.c
> @@ -208,7 +208,7 @@ static int ade7854_i2c_probe(struct i2c_client *client,
> struct ade7854_state *st;
> struct iio_dev *indio_dev;
>
> - indio_dev = iio_device_alloc(sizeof(*st));
> + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
> if (indio_dev == NULL)
> return -ENOMEM;
> st = iio_priv(indio_dev);
> @@ -225,8 +225,6 @@ static int ade7854_i2c_probe(struct i2c_client *client,
> st->irq = client->irq;
>
> ret = ade7854_probe(indio_dev, &client->dev);
> - if (ret)
> - iio_device_free(indio_dev);
>
> return ret;
> }
> diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
> index 4c6d204..94f73bb 100644
> --- a/drivers/staging/iio/meter/ade7854-spi.c
> +++ b/drivers/staging/iio/meter/ade7854-spi.c
> @@ -278,7 +278,7 @@ static int ade7854_spi_probe(struct spi_device *spi)
> struct ade7854_state *st;
> struct iio_dev *indio_dev;
>
> - 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);
> @@ -296,8 +296,6 @@ static int ade7854_spi_probe(struct spi_device *spi)
>
>
> ret = ade7854_probe(indio_dev, &spi->dev);
> - if (ret)
> - iio_device_free(indio_dev);
>
> return ret;
> }
> diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
> index 8e068ab..d620bbd 100644
> --- a/drivers/staging/iio/meter/ade7854.c
> +++ b/drivers/staging/iio/meter/ade7854.c
> @@ -550,7 +550,7 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
>
> ret = iio_device_register(indio_dev);
> if (ret)
> - goto error_free_dev;
> + return ret;
>
> /* Get the device into a sane initial state */
> ret = ade7854_initial_setup(indio_dev);
> @@ -561,9 +561,6 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
>
> error_unreg_dev:
> iio_device_unregister(indio_dev);
> -error_free_dev:
> - iio_device_free(indio_dev);
> -
> return ret;
> }
> EXPORT_SYMBOL(ade7854_probe);
> @@ -571,7 +568,6 @@ EXPORT_SYMBOL(ade7854_probe);
> int ade7854_remove(struct iio_dev *indio_dev)
> {
> iio_device_unregister(indio_dev);
> - iio_device_free(indio_dev);
>
> return 0;
> }
>
next prev parent reply other threads:[~2013-09-14 10:00 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
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 [this message]
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=523441BF.7020103@kernel.org \
--to=jic23@kernel.org \
--cc=21cnbao@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).