All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 4/4] iio: adc: ad7266: Use devm_* APIs
@ 2013-07-23  6:50 Sachin Kamat
  2013-07-24  8:05 ` Lars-Peter Clausen
  0 siblings, 1 reply; 3+ messages in thread
From: Sachin Kamat @ 2013-07-23  6:50 UTC (permalink / raw)
  To: linux-iio; +Cc: jic23, jic23, sachin.kamat, Lars-Peter Clausen

devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/adc/ad7266.c |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index c2744a7..371731d 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -399,17 +399,17 @@ static int ad7266_probe(struct spi_device *spi)
 	unsigned int i;
 	int ret;
 
-	indio_dev = iio_device_alloc(sizeof(*st));
+	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
 	if (indio_dev == NULL)
 		return -ENOMEM;
 
 	st = iio_priv(indio_dev);
 
-	st->reg = regulator_get(&spi->dev, "vref");
+	st->reg = devm_regulator_get(&spi->dev, "vref");
 	if (!IS_ERR_OR_NULL(st->reg)) {
 		ret = regulator_enable(st->reg);
 		if (ret)
-			goto error_put_reg;
+			return ret;
 
 		ret = regulator_get_voltage(st->reg);
 		if (ret < 0)
@@ -489,11 +489,6 @@ error_free_gpios:
 error_disable_reg:
 	if (!IS_ERR_OR_NULL(st->reg))
 		regulator_disable(st->reg);
-error_put_reg:
-	if (!IS_ERR_OR_NULL(st->reg))
-		regulator_put(st->reg);
-
-	iio_device_free(indio_dev);
 
 	return ret;
 }
@@ -507,11 +502,8 @@ static int ad7266_remove(struct spi_device *spi)
 	iio_triggered_buffer_cleanup(indio_dev);
 	if (!st->fixed_addr)
 		gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
-	if (!IS_ERR_OR_NULL(st->reg)) {
+	if (!IS_ERR_OR_NULL(st->reg))
 		regulator_disable(st->reg);
-		regulator_put(st->reg);
-	}
-	iio_device_free(indio_dev);
 
 	return 0;
 }
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 4/4] iio: adc: ad7266: Use devm_* APIs
  2013-07-23  6:50 [PATCH 4/4] iio: adc: ad7266: Use devm_* APIs Sachin Kamat
@ 2013-07-24  8:05 ` Lars-Peter Clausen
  2013-07-27 10:59   ` Jonathan Cameron
  0 siblings, 1 reply; 3+ messages in thread
From: Lars-Peter Clausen @ 2013-07-24  8:05 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: linux-iio, jic23, jic23

On 07/23/2013 08:50 AM, Sachin Kamat wrote:
> devm_* APIs are device managed and make code simpler.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Lars-Peter Clausen <lars@metafoo.de>

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

> ---
>  drivers/iio/adc/ad7266.c |   16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
> index c2744a7..371731d 100644
> --- a/drivers/iio/adc/ad7266.c
> +++ b/drivers/iio/adc/ad7266.c
> @@ -399,17 +399,17 @@ static int ad7266_probe(struct spi_device *spi)
>  	unsigned int i;
>  	int ret;
>  
> -	indio_dev = iio_device_alloc(sizeof(*st));
> +	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
>  	if (indio_dev == NULL)
>  		return -ENOMEM;
>  
>  	st = iio_priv(indio_dev);
>  
> -	st->reg = regulator_get(&spi->dev, "vref");
> +	st->reg = devm_regulator_get(&spi->dev, "vref");
>  	if (!IS_ERR_OR_NULL(st->reg)) {
>  		ret = regulator_enable(st->reg);
>  		if (ret)
> -			goto error_put_reg;
> +			return ret;
>  
>  		ret = regulator_get_voltage(st->reg);
>  		if (ret < 0)
> @@ -489,11 +489,6 @@ error_free_gpios:
>  error_disable_reg:
>  	if (!IS_ERR_OR_NULL(st->reg))
>  		regulator_disable(st->reg);
> -error_put_reg:
> -	if (!IS_ERR_OR_NULL(st->reg))
> -		regulator_put(st->reg);
> -
> -	iio_device_free(indio_dev);
>  
>  	return ret;
>  }
> @@ -507,11 +502,8 @@ static int ad7266_remove(struct spi_device *spi)
>  	iio_triggered_buffer_cleanup(indio_dev);
>  	if (!st->fixed_addr)
>  		gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
> -	if (!IS_ERR_OR_NULL(st->reg)) {
> +	if (!IS_ERR_OR_NULL(st->reg))
>  		regulator_disable(st->reg);
> -		regulator_put(st->reg);
> -	}
> -	iio_device_free(indio_dev);
>  
>  	return 0;
>  }
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 4/4] iio: adc: ad7266: Use devm_* APIs
  2013-07-24  8:05 ` Lars-Peter Clausen
@ 2013-07-27 10:59   ` Jonathan Cameron
  0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2013-07-27 10:59 UTC (permalink / raw)
  To: Lars-Peter Clausen; +Cc: Sachin Kamat, linux-iio, jic23

On 07/24/13 09:05, Lars-Peter Clausen wrote:
> On 07/23/2013 08:50 AM, Sachin Kamat wrote:
>> devm_* APIs are device managed and make code simpler.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Lars-Peter Clausen <lars@metafoo.de>
> 
> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git
Thanks
> 
>> ---
>>  drivers/iio/adc/ad7266.c |   16 ++++------------
>>  1 file changed, 4 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
>> index c2744a7..371731d 100644
>> --- a/drivers/iio/adc/ad7266.c
>> +++ b/drivers/iio/adc/ad7266.c
>> @@ -399,17 +399,17 @@ static int ad7266_probe(struct spi_device *spi)
>>  	unsigned int i;
>>  	int ret;
>>  
>> -	indio_dev = iio_device_alloc(sizeof(*st));
>> +	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
>>  	if (indio_dev == NULL)
>>  		return -ENOMEM;
>>  
>>  	st = iio_priv(indio_dev);
>>  
>> -	st->reg = regulator_get(&spi->dev, "vref");
>> +	st->reg = devm_regulator_get(&spi->dev, "vref");
>>  	if (!IS_ERR_OR_NULL(st->reg)) {
>>  		ret = regulator_enable(st->reg);
>>  		if (ret)
>> -			goto error_put_reg;
>> +			return ret;
>>  
>>  		ret = regulator_get_voltage(st->reg);
>>  		if (ret < 0)
>> @@ -489,11 +489,6 @@ error_free_gpios:
>>  error_disable_reg:
>>  	if (!IS_ERR_OR_NULL(st->reg))
>>  		regulator_disable(st->reg);
>> -error_put_reg:
>> -	if (!IS_ERR_OR_NULL(st->reg))
>> -		regulator_put(st->reg);
>> -
>> -	iio_device_free(indio_dev);
>>  
>>  	return ret;
>>  }
>> @@ -507,11 +502,8 @@ static int ad7266_remove(struct spi_device *spi)
>>  	iio_triggered_buffer_cleanup(indio_dev);
>>  	if (!st->fixed_addr)
>>  		gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
>> -	if (!IS_ERR_OR_NULL(st->reg)) {
>> +	if (!IS_ERR_OR_NULL(st->reg))
>>  		regulator_disable(st->reg);
>> -		regulator_put(st->reg);
>> -	}
>> -	iio_device_free(indio_dev);
>>  
>>  	return 0;
>>  }
>>
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-27  9:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-23  6:50 [PATCH 4/4] iio: adc: ad7266: Use devm_* APIs Sachin Kamat
2013-07-24  8:05 ` Lars-Peter Clausen
2013-07-27 10:59   ` 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.