From: Jonathan Cameron <jic23@kernel.org>
To: Sachin Kamat <sachin.kamat@linaro.org>
Cc: linux-iio@vger.kernel.org, jic23@cam.ac.uk,
Denis Ciocca <denis.ciocca@st.com>
Subject: Re: [PATCH 3/4] iio: accel: st_accel: Use devm_iio_device_alloc
Date: Sat, 27 Jul 2013 12:42:27 +0100 [thread overview]
Message-ID: <51F3B223.1050001@kernel.org> (raw)
In-Reply-To: <1374562030-28621-3-git-send-email-sachin.kamat@linaro.org>
On 07/23/13 07:47, Sachin Kamat wrote:
> Using devm_iio_device_alloc makes code simpler.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Denis Ciocca <denis.ciocca@st.com>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/iio/accel/st_accel_core.c | 1 -
> drivers/iio/accel/st_accel_i2c.c | 15 ++++-----------
> drivers/iio/accel/st_accel_spi.c | 15 ++++-----------
> 3 files changed, 8 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index aef3c9b..1458343 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -517,7 +517,6 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
> st_sensors_deallocate_trigger(indio_dev);
> st_accel_deallocate_ring(indio_dev);
> }
> - iio_device_free(indio_dev);
> }
> EXPORT_SYMBOL(st_accel_common_remove);
>
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index 58d164d..d7bedbd 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -25,11 +25,9 @@ static int st_accel_i2c_probe(struct i2c_client *client,
> struct st_sensor_data *adata;
> int err;
>
> - indio_dev = iio_device_alloc(sizeof(*adata));
> - if (indio_dev == NULL) {
> - err = -ENOMEM;
> - goto iio_device_alloc_error;
> - }
> + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*adata));
> + if (!indio_dev)
> + return -ENOMEM;
>
> adata = iio_priv(indio_dev);
> adata->dev = &client->dev;
> @@ -38,14 +36,9 @@ static int st_accel_i2c_probe(struct i2c_client *client,
>
> err = st_accel_common_probe(indio_dev, client->dev.platform_data);
> if (err < 0)
> - goto st_accel_common_probe_error;
> + return err;
>
> return 0;
> -
> -st_accel_common_probe_error:
> - iio_device_free(indio_dev);
> -iio_device_alloc_error:
> - return err;
> }
>
> static int st_accel_i2c_remove(struct i2c_client *client)
> diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
> index 21ed929..1956396 100644
> --- a/drivers/iio/accel/st_accel_spi.c
> +++ b/drivers/iio/accel/st_accel_spi.c
> @@ -24,11 +24,9 @@ static int st_accel_spi_probe(struct spi_device *spi)
> struct st_sensor_data *adata;
> int err;
>
> - indio_dev = iio_device_alloc(sizeof(*adata));
> - if (indio_dev == NULL) {
> - err = -ENOMEM;
> - goto iio_device_alloc_error;
> - }
> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adata));
> + if (!indio_dev)
> + return -ENOMEM;
>
> adata = iio_priv(indio_dev);
> adata->dev = &spi->dev;
> @@ -37,14 +35,9 @@ static int st_accel_spi_probe(struct spi_device *spi)
>
> err = st_accel_common_probe(indio_dev, spi->dev.platform_data);
> if (err < 0)
> - goto st_accel_common_probe_error;
> + return err;
>
> return 0;
> -
> -st_accel_common_probe_error:
> - iio_device_free(indio_dev);
> -iio_device_alloc_error:
> - return err;
> }
>
> static int st_accel_spi_remove(struct spi_device *spi)
>
next prev parent reply other threads:[~2013-07-27 10:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 6:47 [PATCH 1/4] iio: hid-sensor-accel-3d: Use devm_iio_device_alloc Sachin Kamat
2013-07-23 6:47 ` [PATCH 2/4] iio: accel: kxsd9: " Sachin Kamat
2013-07-27 11:41 ` Jonathan Cameron
2013-07-23 6:47 ` [PATCH 3/4] iio: accel: st_accel: " Sachin Kamat
2013-07-27 11:42 ` Jonathan Cameron [this message]
2013-07-27 11:40 ` [PATCH 1/4] iio: hid-sensor-accel-3d: " 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=51F3B223.1050001@kernel.org \
--to=jic23@kernel.org \
--cc=denis.ciocca@st.com \
--cc=jic23@cam.ac.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.