From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-iio@vger.kernel.org
Cc: jic23@kernel.org, jic23@cam.ac.uk, sachin.kamat@linaro.org,
Denis Ciocca <denis.ciocca@st.com>
Subject: [PATCH 8/9] iio: gyro: st_gyro: Use devm_iio_device_alloc
Date: Tue, 13 Aug 2013 12:04:34 +0530 [thread overview]
Message-ID: <1376375675-11595-8-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1376375675-11595-1-git-send-email-sachin.kamat@linaro.org>
Using devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Denis Ciocca <denis.ciocca@st.com>
---
drivers/iio/gyro/st_gyro_core.c | 1 -
drivers/iio/gyro/st_gyro_i2c.c | 15 ++++-----------
drivers/iio/gyro/st_gyro_spi.c | 15 ++++-----------
3 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 85fa8d3..e13c2b0 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -366,7 +366,6 @@ void st_gyro_common_remove(struct iio_dev *indio_dev)
st_sensors_deallocate_trigger(indio_dev);
st_gyro_deallocate_ring(indio_dev);
}
- iio_device_free(indio_dev);
}
EXPORT_SYMBOL(st_gyro_common_remove);
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index c7a29a4..16b8b8d 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -25,11 +25,9 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
struct st_sensor_data *gdata;
int err;
- indio_dev = iio_device_alloc(sizeof(*gdata));
- if (indio_dev == NULL) {
- err = -ENOMEM;
- goto iio_device_alloc_error;
- }
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*gdata));
+ if (!indio_dev)
+ return -ENOMEM;
gdata = iio_priv(indio_dev);
gdata->dev = &client->dev;
@@ -39,14 +37,9 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
err = st_gyro_common_probe(indio_dev,
(struct st_sensors_platform_data *)&gyro_pdata);
if (err < 0)
- goto st_gyro_common_probe_error;
+ return err;
return 0;
-
-st_gyro_common_probe_error:
- iio_device_free(indio_dev);
-iio_device_alloc_error:
- return err;
}
static int st_gyro_i2c_remove(struct i2c_client *client)
diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index 14b0762..94763e2 100644
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -24,11 +24,9 @@ static int st_gyro_spi_probe(struct spi_device *spi)
struct st_sensor_data *gdata;
int err;
- indio_dev = iio_device_alloc(sizeof(*gdata));
- if (indio_dev == NULL) {
- err = -ENOMEM;
- goto iio_device_alloc_error;
- }
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*gdata));
+ if (!indio_dev)
+ return -ENOMEM;
gdata = iio_priv(indio_dev);
gdata->dev = &spi->dev;
@@ -38,14 +36,9 @@ static int st_gyro_spi_probe(struct spi_device *spi)
err = st_gyro_common_probe(indio_dev,
(struct st_sensors_platform_data *)&gyro_pdata);
if (err < 0)
- goto st_gyro_common_probe_error;
+ return err;
return 0;
-
-st_gyro_common_probe_error:
- iio_device_free(indio_dev);
-iio_device_alloc_error:
- return err;
}
static int st_gyro_spi_remove(struct spi_device *spi)
--
1.7.9.5
next prev parent reply other threads:[~2013-08-13 6:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 6:34 [PATCH 1/9] iio: gyro: adis16080: Use devm_iio_device_alloc Sachin Kamat
2013-08-13 6:34 ` [PATCH 2/9] iio: gyro: adis16130: " Sachin Kamat
2013-08-13 18:35 ` Jonathan Cameron
2013-08-13 6:34 ` [PATCH 3/9] iio: gyro: adis16136: " Sachin Kamat
2013-08-13 18:35 ` Jonathan Cameron
2013-08-13 6:34 ` [PATCH 4/9] iio: gyro: adis16260: " Sachin Kamat
2013-08-13 18:37 ` Jonathan Cameron
2013-08-13 6:34 ` [PATCH 5/9] iio: gyro: adxrs450: " Sachin Kamat
2013-08-13 18:38 ` Jonathan Cameron
2013-08-13 6:34 ` [PATCH 6/9] iio: hid-sensor-gyro-3d: " Sachin Kamat
2013-08-13 18:39 ` Jonathan Cameron
2013-08-13 6:34 ` [PATCH 7/9] iio: gyro: itg3200_core: " Sachin Kamat
2013-08-13 18:40 ` Jonathan Cameron
2013-08-13 6:34 ` Sachin Kamat [this message]
2013-08-13 18:41 ` [PATCH 8/9] iio: gyro: st_gyro: " Jonathan Cameron
2013-08-13 6:34 ` [PATCH 9/9] iio: gyro: adis16060_core: " Sachin Kamat
2013-08-13 18:42 ` Jonathan Cameron
2013-08-13 9:03 ` [PATCH 1/9] iio: gyro: adis16080: " Lars-Peter Clausen
2013-08-13 18:32 ` 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=1376375675-11595-8-git-send-email-sachin.kamat@linaro.org \
--to=sachin.kamat@linaro.org \
--cc=denis.ciocca@st.com \
--cc=jic23@cam.ac.uk \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.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).