[PATCH iio v2 0/3] cleanup for InvenSense MPU6050

[PATCH iio v2 0/3] cleanup for InvenSense MPU6050

[Varka Bhadram]

changes since v1:
 - reorder patch-1 and patch-2

Varka Bhadram (3):
  imu: inv_mpu6050: use devm_iio_trigger_alloc
  imu: inv_mpu6050: use devm_request_irq
  imu: inv_mpu6050: cleanup on error check

 drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c |   39 +++++++++++--------------
 1 file changed, 17 insertions(+), 22 deletions(-)

-- 
1.7.9.5

[PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc

[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

[PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq

[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

[PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check

[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

Re: [PATCH iio v2 1/3] imu: inv_mpu6050: use devm_iio_trigger_alloc

[Jonathan Cameron]

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);
>  }
> 

Re: [PATCH iio v2 2/3] imu: inv_mpu6050: use devm_request_irq

[Jonathan Cameron]

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);
>  }
> 

Re: [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check

[Jonathan Cameron]

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)
>