* [PATCH 1/4] iio: hid-sensor-accel-3d: Use devm_iio_device_alloc
@ 2013-07-23 6:47 Sachin Kamat
2013-07-23 6:47 ` [PATCH 2/4] iio: accel: kxsd9: " Sachin Kamat
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Sachin Kamat @ 2013-07-23 6:47 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, jic23, sachin.kamat, Srinivas Pandruvada
Using devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
---
This series is compile tested and based on togreg branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
---
drivers/iio/accel/hid-sensor-accel-3d.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 275c5d7..68df341 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -282,11 +282,11 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
struct iio_chan_spec *channels;
- indio_dev = iio_device_alloc(sizeof(struct accel_3d_state));
- if (indio_dev == NULL) {
- ret = -ENOMEM;
- goto error_ret;
- }
+ indio_dev = devm_iio_device_alloc(&pdev->dev,
+ sizeof(struct accel_3d_state));
+ if (indio_dev == NULL)
+ return -ENOMEM;
+
platform_set_drvdata(pdev, indio_dev);
accel_state = iio_priv(indio_dev);
@@ -298,15 +298,14 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
&accel_state->common_attributes);
if (ret) {
dev_err(&pdev->dev, "failed to setup common attributes\n");
- goto error_free_dev;
+ return ret;
}
channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels),
GFP_KERNEL);
if (!channels) {
- ret = -ENOMEM;
dev_err(&pdev->dev, "failed to duplicate channels\n");
- goto error_free_dev;
+ return -ENOMEM;
}
ret = accel_3d_parse_report(pdev, hsdev, channels,
@@ -363,9 +362,6 @@ error_unreg_buffer_funcs:
iio_triggered_buffer_cleanup(indio_dev);
error_free_dev_mem:
kfree(indio_dev->channels);
-error_free_dev:
- iio_device_free(indio_dev);
-error_ret:
return ret;
}
@@ -380,7 +376,6 @@ static int hid_accel_3d_remove(struct platform_device *pdev)
hid_sensor_remove_trigger(indio_dev);
iio_triggered_buffer_cleanup(indio_dev);
kfree(indio_dev->channels);
- iio_device_free(indio_dev);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] iio: accel: kxsd9: Use devm_iio_device_alloc
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 ` 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:40 ` [PATCH 1/4] iio: hid-sensor-accel-3d: " Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Sachin Kamat @ 2013-07-23 6:47 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, jic23, sachin.kamat
Using devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/iio/accel/kxsd9.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 7229645..709c132 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -224,11 +224,10 @@ static int kxsd9_probe(struct spi_device *spi)
struct kxsd9_state *st;
int 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;
+
st = iio_priv(indio_dev);
spi_set_drvdata(spi, indio_dev);
@@ -247,20 +246,14 @@ static int kxsd9_probe(struct spi_device *spi)
ret = iio_device_register(indio_dev);
if (ret)
- goto error_free_dev;
+ return ret;
return 0;
-
-error_free_dev:
- iio_device_free(indio_dev);
-error_ret:
- return ret;
}
static int kxsd9_remove(struct spi_device *spi)
{
iio_device_unregister(spi_get_drvdata(spi));
- iio_device_free(spi_get_drvdata(spi));
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/4] iio: accel: kxsd9: Use devm_iio_device_alloc
2013-07-23 6:47 ` [PATCH 2/4] iio: accel: kxsd9: " Sachin Kamat
@ 2013-07-27 11:41 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2013-07-27 11:41 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-iio
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>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/iio/accel/kxsd9.c | 17 +++++------------
> 1 file changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
> index 7229645..709c132 100644
> --- a/drivers/iio/accel/kxsd9.c
> +++ b/drivers/iio/accel/kxsd9.c
> @@ -224,11 +224,10 @@ static int kxsd9_probe(struct spi_device *spi)
> struct kxsd9_state *st;
> int 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;
> +
> st = iio_priv(indio_dev);
> spi_set_drvdata(spi, indio_dev);
>
> @@ -247,20 +246,14 @@ static int kxsd9_probe(struct spi_device *spi)
>
> ret = iio_device_register(indio_dev);
> if (ret)
> - goto error_free_dev;
> + return ret;
>
> return 0;
> -
> -error_free_dev:
> - iio_device_free(indio_dev);
> -error_ret:
> - return ret;
> }
>
> static int kxsd9_remove(struct spi_device *spi)
> {
> iio_device_unregister(spi_get_drvdata(spi));
> - iio_device_free(spi_get_drvdata(spi));
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/4] iio: accel: st_accel: Use devm_iio_device_alloc
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-23 6:47 ` Sachin Kamat
2013-07-27 11:42 ` Jonathan Cameron
2013-07-27 11:40 ` [PATCH 1/4] iio: hid-sensor-accel-3d: " Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Sachin Kamat @ 2013-07-23 6:47 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, jic23, sachin.kamat, Denis Ciocca
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/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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/4] iio: accel: st_accel: Use devm_iio_device_alloc
2013-07-23 6:47 ` [PATCH 3/4] iio: accel: st_accel: " Sachin Kamat
@ 2013-07-27 11:42 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2013-07-27 11:42 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-iio, jic23, Denis Ciocca
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)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] iio: hid-sensor-accel-3d: Use devm_iio_device_alloc
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-23 6:47 ` [PATCH 3/4] iio: accel: st_accel: " Sachin Kamat
@ 2013-07-27 11:40 ` Jonathan Cameron
2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2013-07-27 11:40 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-iio, Srinivas Pandruvada
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: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Applied to the togreg branch of iio.git
Thanks.
> ---
> This series is compile tested and based on togreg branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
> ---
> drivers/iio/accel/hid-sensor-accel-3d.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
> index 275c5d7..68df341 100644
> --- a/drivers/iio/accel/hid-sensor-accel-3d.c
> +++ b/drivers/iio/accel/hid-sensor-accel-3d.c
> @@ -282,11 +282,11 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
> struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
> struct iio_chan_spec *channels;
>
> - indio_dev = iio_device_alloc(sizeof(struct accel_3d_state));
> - if (indio_dev == NULL) {
> - ret = -ENOMEM;
> - goto error_ret;
> - }
> + indio_dev = devm_iio_device_alloc(&pdev->dev,
> + sizeof(struct accel_3d_state));
> + if (indio_dev == NULL)
> + return -ENOMEM;
> +
> platform_set_drvdata(pdev, indio_dev);
>
> accel_state = iio_priv(indio_dev);
> @@ -298,15 +298,14 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
> &accel_state->common_attributes);
> if (ret) {
> dev_err(&pdev->dev, "failed to setup common attributes\n");
> - goto error_free_dev;
> + return ret;
> }
>
> channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels),
> GFP_KERNEL);
> if (!channels) {
> - ret = -ENOMEM;
> dev_err(&pdev->dev, "failed to duplicate channels\n");
> - goto error_free_dev;
> + return -ENOMEM;
> }
>
> ret = accel_3d_parse_report(pdev, hsdev, channels,
> @@ -363,9 +362,6 @@ error_unreg_buffer_funcs:
> iio_triggered_buffer_cleanup(indio_dev);
> error_free_dev_mem:
> kfree(indio_dev->channels);
> -error_free_dev:
> - iio_device_free(indio_dev);
> -error_ret:
> return ret;
> }
>
> @@ -380,7 +376,6 @@ static int hid_accel_3d_remove(struct platform_device *pdev)
> hid_sensor_remove_trigger(indio_dev);
> iio_triggered_buffer_cleanup(indio_dev);
> kfree(indio_dev->channels);
> - iio_device_free(indio_dev);
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-07-27 10:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2013-07-27 11:40 ` [PATCH 1/4] iio: hid-sensor-accel-3d: " Jonathan Cameron
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.