* [PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc
2015-01-22 3:38 [PATCH iio v2 0/3] cleanup for InvenSense MPU6050 Varka Bhadram
@ 2015-01-22 3:38 ` Varka Bhadram
2015-01-26 21:15 ` Jonathan Cameron
2015-01-22 3:38 ` [PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq Varka Bhadram
2015-01-22 3:38 ` [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check Varka Bhadram
2 siblings, 1 reply; 7+ messages in thread
From: Varka Bhadram @ 2015-01-22 3:38 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, lars, Varka Bhadram
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index 926fcce..c827d21 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -116,9 +116,10 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
int ret;
struct inv_mpu6050_state *st = iio_priv(indio_dev);
- st->trig = iio_trigger_alloc("%s-dev%d",
- indio_dev->name,
- indio_dev->id);
+ st->trig = devm_iio_trigger_alloc(&indio_dev->dev,
+ "%s-dev%d",
+ indio_dev->name,
+ indio_dev->id);
if (st->trig == NULL) {
ret = -ENOMEM;
goto error_ret;
@@ -128,7 +129,7 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
"inv_mpu",
st->trig);
if (ret)
- goto error_free_trig;
+ goto error_ret;
st->trig->dev.parent = &st->client->dev;
st->trig->ops = &inv_mpu_trigger_ops;
iio_trigger_set_drvdata(st->trig, indio_dev);
@@ -141,8 +142,6 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
error_free_irq:
free_irq(st->client->irq, st->trig);
-error_free_trig:
- iio_trigger_free(st->trig);
error_ret:
return ret;
}
@@ -151,5 +150,4 @@ void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
{
iio_trigger_unregister(st->trig);
free_irq(st->client->irq, st->trig);
- iio_trigger_free(st->trig);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc
2015-01-22 3:38 ` [PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc Varka Bhadram
@ 2015-01-26 21:15 ` Jonathan Cameron
0 siblings, 0 replies; 7+ messages in thread
From: Jonathan Cameron @ 2015-01-26 21:15 UTC (permalink / raw)
To: Varka Bhadram, linux-iio; +Cc: lars, Varka Bhadram
On 22/01/15 03:38, Varka Bhadram wrote:
> Signed-off-by: Varka Bhadram <varkab@cdac.in>
Applied to the togreg branch of iio.git - initially pushed out as testing
for the autobuilders to play with it.
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> index 926fcce..c827d21 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> @@ -116,9 +116,10 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> int ret;
> struct inv_mpu6050_state *st = iio_priv(indio_dev);
>
> - st->trig = iio_trigger_alloc("%s-dev%d",
> - indio_dev->name,
> - indio_dev->id);
> + st->trig = devm_iio_trigger_alloc(&indio_dev->dev,
> + "%s-dev%d",
> + indio_dev->name,
> + indio_dev->id);
> if (st->trig == NULL) {
> ret = -ENOMEM;
> goto error_ret;
> @@ -128,7 +129,7 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> "inv_mpu",
> st->trig);
> if (ret)
> - goto error_free_trig;
> + goto error_ret;
> st->trig->dev.parent = &st->client->dev;
> st->trig->ops = &inv_mpu_trigger_ops;
> iio_trigger_set_drvdata(st->trig, indio_dev);
> @@ -141,8 +142,6 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
>
> error_free_irq:
> free_irq(st->client->irq, st->trig);
> -error_free_trig:
> - iio_trigger_free(st->trig);
> error_ret:
> return ret;
> }
> @@ -151,5 +150,4 @@ void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
> {
> iio_trigger_unregister(st->trig);
> free_irq(st->client->irq, st->trig);
> - iio_trigger_free(st->trig);
> }
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq
2015-01-22 3:38 [PATCH iio v2 0/3] cleanup for InvenSense MPU6050 Varka Bhadram
2015-01-22 3:38 ` [PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc Varka Bhadram
@ 2015-01-22 3:38 ` Varka Bhadram
2015-01-26 21:16 ` Jonathan Cameron
2015-01-22 3:38 ` [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check Varka Bhadram
2 siblings, 1 reply; 7+ messages in thread
From: Varka Bhadram @ 2015-01-22 3:38 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, lars, Varka Bhadram
This patch use the devres API for requesting an IRQ.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index c827d21..ab8c85a 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -124,10 +124,11 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
ret = -ENOMEM;
goto error_ret;
}
- ret = request_irq(st->client->irq, &iio_trigger_generic_data_rdy_poll,
- IRQF_TRIGGER_RISING,
- "inv_mpu",
- st->trig);
+ ret = devm_request_irq(&indio_dev->dev, st->client->irq,
+ &iio_trigger_generic_data_rdy_poll,
+ IRQF_TRIGGER_RISING,
+ "inv_mpu",
+ st->trig);
if (ret)
goto error_ret;
st->trig->dev.parent = &st->client->dev;
@@ -135,13 +136,11 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
iio_trigger_set_drvdata(st->trig, indio_dev);
ret = iio_trigger_register(st->trig);
if (ret)
- goto error_free_irq;
+ goto error_ret;
indio_dev->trig = iio_trigger_get(st->trig);
return 0;
-error_free_irq:
- free_irq(st->client->irq, st->trig);
error_ret:
return ret;
}
@@ -149,5 +148,4 @@ error_ret:
void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
{
iio_trigger_unregister(st->trig);
- free_irq(st->client->irq, st->trig);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq
2015-01-22 3:38 ` [PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq Varka Bhadram
@ 2015-01-26 21:16 ` Jonathan Cameron
0 siblings, 0 replies; 7+ messages in thread
From: Jonathan Cameron @ 2015-01-26 21:16 UTC (permalink / raw)
To: Varka Bhadram, linux-iio; +Cc: lars, Varka Bhadram
On 22/01/15 03:38, Varka Bhadram wrote:
> This patch use the devres API for requesting an IRQ.
>
> Signed-off-by: Varka Bhadram <varkab@cdac.in>
Applied to the togreg branch of iio.git > testing for
autobuilders.
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> index c827d21..ab8c85a 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> @@ -124,10 +124,11 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - ret = request_irq(st->client->irq, &iio_trigger_generic_data_rdy_poll,
> - IRQF_TRIGGER_RISING,
> - "inv_mpu",
> - st->trig);
> + ret = devm_request_irq(&indio_dev->dev, st->client->irq,
> + &iio_trigger_generic_data_rdy_poll,
> + IRQF_TRIGGER_RISING,
> + "inv_mpu",
> + st->trig);
> if (ret)
> goto error_ret;
> st->trig->dev.parent = &st->client->dev;
> @@ -135,13 +136,11 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> iio_trigger_set_drvdata(st->trig, indio_dev);
> ret = iio_trigger_register(st->trig);
> if (ret)
> - goto error_free_irq;
> + goto error_ret;
> indio_dev->trig = iio_trigger_get(st->trig);
>
> return 0;
>
> -error_free_irq:
> - free_irq(st->client->irq, st->trig);
> error_ret:
> return ret;
> }
> @@ -149,5 +148,4 @@ error_ret:
> void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
> {
> iio_trigger_unregister(st->trig);
> - free_irq(st->client->irq, st->trig);
> }
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check
2015-01-22 3:38 [PATCH iio v2 0/3] cleanup for InvenSense MPU6050 Varka Bhadram
2015-01-22 3:38 ` [PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc Varka Bhadram
2015-01-22 3:38 ` [PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq Varka Bhadram
@ 2015-01-22 3:38 ` Varka Bhadram
2015-01-26 21:17 ` Jonathan Cameron
2 siblings, 1 reply; 7+ messages in thread
From: Varka Bhadram @ 2015-01-22 3:38 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, lars, Varka Bhadram
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index ab8c85a..844610c 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -120,29 +120,28 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
"%s-dev%d",
indio_dev->name,
indio_dev->id);
- if (st->trig == NULL) {
- ret = -ENOMEM;
- goto error_ret;
- }
+ if (!st->trig)
+ return -ENOMEM;
+
ret = devm_request_irq(&indio_dev->dev, st->client->irq,
&iio_trigger_generic_data_rdy_poll,
IRQF_TRIGGER_RISING,
"inv_mpu",
st->trig);
if (ret)
- goto error_ret;
+ return ret;
+
st->trig->dev.parent = &st->client->dev;
st->trig->ops = &inv_mpu_trigger_ops;
iio_trigger_set_drvdata(st->trig, indio_dev);
+
ret = iio_trigger_register(st->trig);
if (ret)
- goto error_ret;
+ return ret;
+
indio_dev->trig = iio_trigger_get(st->trig);
return 0;
-
-error_ret:
- return ret;
}
void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check
2015-01-22 3:38 ` [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check Varka Bhadram
@ 2015-01-26 21:17 ` Jonathan Cameron
0 siblings, 0 replies; 7+ messages in thread
From: Jonathan Cameron @ 2015-01-26 21:17 UTC (permalink / raw)
To: Varka Bhadram, linux-iio; +Cc: lars, Varka Bhadram
On 22/01/15 03:38, Varka Bhadram wrote:
> Signed-off-by: Varka Bhadram <varkab@cdac.in>
Applied etc.
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> index ab8c85a..844610c 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> @@ -120,29 +120,28 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> "%s-dev%d",
> indio_dev->name,
> indio_dev->id);
> - if (st->trig == NULL) {
> - ret = -ENOMEM;
> - goto error_ret;
> - }
> + if (!st->trig)
> + return -ENOMEM;
> +
> ret = devm_request_irq(&indio_dev->dev, st->client->irq,
> &iio_trigger_generic_data_rdy_poll,
> IRQF_TRIGGER_RISING,
> "inv_mpu",
> st->trig);
> if (ret)
> - goto error_ret;
> + return ret;
> +
> st->trig->dev.parent = &st->client->dev;
> st->trig->ops = &inv_mpu_trigger_ops;
> iio_trigger_set_drvdata(st->trig, indio_dev);
> +
> ret = iio_trigger_register(st->trig);
> if (ret)
> - goto error_ret;
> + return ret;
> +
> indio_dev->trig = iio_trigger_get(st->trig);
>
> return 0;
> -
> -error_ret:
> - return ret;
> }
>
> void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
>
^ permalink raw reply [flat|nested] 7+ messages in thread