Re: [PATCH v2] iio: adc: xilinx: Fix error handling

2017-02-25 Thread Jonathan Cameron 
On 21/02/17 11:55, Lars-Peter Clausen wrote:
> On 02/21/2017 07:34 AM, Christophe JAILLET wrote:
>> Reorder error handling labels in order to match the way resources have
>> been allocated.
>>
>> Signed-off-by: Christophe JAILLET 
> 
> Thanks.
> 
> Acked-by: Lars-Peter Clausen 
Applied to the fixes-togreg-post-rc1 branch of iio.git.

Thanks,

Jonathan
> 
>> ---
>> v2: update goto label if 'xadc->ops->setup()' fails
>> ---
>>  drivers/iio/adc/xilinx-xadc-core.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
>> b/drivers/iio/adc/xilinx-xadc-core.c
>> index 0a6beb3d99cb..515b91963db5 100644
>> --- a/drivers/iio/adc/xilinx-xadc-core.c
>> +++ b/drivers/iio/adc/xilinx-xadc-core.c
>> @@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev)
>>  }
>>  clk_prepare_enable(xadc->clk);
>>  
>>  ret = xadc->ops->setup(pdev, indio_dev, irq);
>>  if (ret)
>> -goto err_free_samplerate_trigger;
>> +goto err_clk_disable_unprepare;
>>  
>>  ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
>>  dev_name(>dev), indio_dev);
>>  if (ret)
>>  goto err_clk_disable_unprepare;
>> @@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
>>  
>>  err_free_irq:
>>  free_irq(irq, indio_dev);
>> +err_clk_disable_unprepare:
>> +clk_disable_unprepare(xadc->clk);
>>  err_free_samplerate_trigger:
>>  if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>>  iio_trigger_free(xadc->samplerate_trigger);
>> @@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
>>  err_triggered_buffer_cleanup:
>>  if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>>  iio_triggered_buffer_cleanup(indio_dev);
>> -err_clk_disable_unprepare:
>> -clk_disable_unprepare(xadc->clk);
>>  err_device_free:
>>  kfree(indio_dev->channels);
>>  
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH v2] iio: adc: xilinx: Fix error handling

2017-02-25 Thread Jonathan Cameron 
On 21/02/17 11:55, Lars-Peter Clausen wrote:
> On 02/21/2017 07:34 AM, Christophe JAILLET wrote:
>> Reorder error handling labels in order to match the way resources have
>> been allocated.
>>
>> Signed-off-by: Christophe JAILLET 
> 
> Thanks.
> 
> Acked-by: Lars-Peter Clausen 
Applied to the fixes-togreg-post-rc1 branch of iio.git.

Thanks,

Jonathan
> 
>> ---
>> v2: update goto label if 'xadc->ops->setup()' fails
>> ---
>>  drivers/iio/adc/xilinx-xadc-core.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
>> b/drivers/iio/adc/xilinx-xadc-core.c
>> index 0a6beb3d99cb..515b91963db5 100644
>> --- a/drivers/iio/adc/xilinx-xadc-core.c
>> +++ b/drivers/iio/adc/xilinx-xadc-core.c
>> @@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev)
>>  }
>>  clk_prepare_enable(xadc->clk);
>>  
>>  ret = xadc->ops->setup(pdev, indio_dev, irq);
>>  if (ret)
>> -goto err_free_samplerate_trigger;
>> +goto err_clk_disable_unprepare;
>>  
>>  ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
>>  dev_name(>dev), indio_dev);
>>  if (ret)
>>  goto err_clk_disable_unprepare;
>> @@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
>>  
>>  err_free_irq:
>>  free_irq(irq, indio_dev);
>> +err_clk_disable_unprepare:
>> +clk_disable_unprepare(xadc->clk);
>>  err_free_samplerate_trigger:
>>  if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>>  iio_trigger_free(xadc->samplerate_trigger);
>> @@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
>>  err_triggered_buffer_cleanup:
>>  if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>>  iio_triggered_buffer_cleanup(indio_dev);
>> -err_clk_disable_unprepare:
>> -clk_disable_unprepare(xadc->clk);
>>  err_device_free:
>>  kfree(indio_dev->channels);
>>  
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH v2] iio: adc: xilinx: Fix error handling

2017-02-21 Thread Lars-Peter Clausen 
On 02/21/2017 07:34 AM, Christophe JAILLET wrote:
> Reorder error handling labels in order to match the way resources have
> been allocated.
> 
> Signed-off-by: Christophe JAILLET 

Thanks.

Acked-by: Lars-Peter Clausen 

> ---
> v2: update goto label if 'xadc->ops->setup()' fails
> ---
>  drivers/iio/adc/xilinx-xadc-core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
> b/drivers/iio/adc/xilinx-xadc-core.c
> index 0a6beb3d99cb..515b91963db5 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev)
>   }
>   clk_prepare_enable(xadc->clk);
>  
>   ret = xadc->ops->setup(pdev, indio_dev, irq);
>   if (ret)
> - goto err_free_samplerate_trigger;
> + goto err_clk_disable_unprepare;
>  
>   ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
>   dev_name(>dev), indio_dev);
>   if (ret)
>   goto err_clk_disable_unprepare;
> @@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
>  
>  err_free_irq:
>   free_irq(irq, indio_dev);
> +err_clk_disable_unprepare:
> + clk_disable_unprepare(xadc->clk);
>  err_free_samplerate_trigger:
>   if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>   iio_trigger_free(xadc->samplerate_trigger);
> @@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
>  err_triggered_buffer_cleanup:
>   if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>   iio_triggered_buffer_cleanup(indio_dev);
> -err_clk_disable_unprepare:
> - clk_disable_unprepare(xadc->clk);
>  err_device_free:
>   kfree(indio_dev->channels);
>  
>

Re: [PATCH v2] iio: adc: xilinx: Fix error handling

2017-02-21 Thread Lars-Peter Clausen 
On 02/21/2017 07:34 AM, Christophe JAILLET wrote:
> Reorder error handling labels in order to match the way resources have
> been allocated.
> 
> Signed-off-by: Christophe JAILLET 

Thanks.

Acked-by: Lars-Peter Clausen 

> ---
> v2: update goto label if 'xadc->ops->setup()' fails
> ---
>  drivers/iio/adc/xilinx-xadc-core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
> b/drivers/iio/adc/xilinx-xadc-core.c
> index 0a6beb3d99cb..515b91963db5 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev)
>   }
>   clk_prepare_enable(xadc->clk);
>  
>   ret = xadc->ops->setup(pdev, indio_dev, irq);
>   if (ret)
> - goto err_free_samplerate_trigger;
> + goto err_clk_disable_unprepare;
>  
>   ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
>   dev_name(>dev), indio_dev);
>   if (ret)
>   goto err_clk_disable_unprepare;
> @@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
>  
>  err_free_irq:
>   free_irq(irq, indio_dev);
> +err_clk_disable_unprepare:
> + clk_disable_unprepare(xadc->clk);
>  err_free_samplerate_trigger:
>   if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>   iio_trigger_free(xadc->samplerate_trigger);
> @@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
>  err_triggered_buffer_cleanup:
>   if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
>   iio_triggered_buffer_cleanup(indio_dev);
> -err_clk_disable_unprepare:
> - clk_disable_unprepare(xadc->clk);
>  err_device_free:
>   kfree(indio_dev->channels);
>  
>

[PATCH v2] iio: adc: xilinx: Fix error handling

2017-02-20 Thread Christophe JAILLET 
Reorder error handling labels in order to match the way resources have
been allocated.

Signed-off-by: Christophe JAILLET 
---
v2: update goto label if 'xadc->ops->setup()' fails
---
 drivers/iio/adc/xilinx-xadc-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
b/drivers/iio/adc/xilinx-xadc-core.c
index 0a6beb3d99cb..515b91963db5 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev)
}
clk_prepare_enable(xadc->clk);
 
ret = xadc->ops->setup(pdev, indio_dev, irq);
if (ret)
-   goto err_free_samplerate_trigger;
+   goto err_clk_disable_unprepare;
 
ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
dev_name(>dev), indio_dev);
if (ret)
goto err_clk_disable_unprepare;
@@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
 
 err_free_irq:
free_irq(irq, indio_dev);
+err_clk_disable_unprepare:
+   clk_disable_unprepare(xadc->clk);
 err_free_samplerate_trigger:
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
iio_trigger_free(xadc->samplerate_trigger);
@@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
 err_triggered_buffer_cleanup:
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
iio_triggered_buffer_cleanup(indio_dev);
-err_clk_disable_unprepare:
-   clk_disable_unprepare(xadc->clk);
 err_device_free:
kfree(indio_dev->channels);
 
-- 
2.9.3

[PATCH v2] iio: adc: xilinx: Fix error handling

2017-02-20 Thread Christophe JAILLET 
Reorder error handling labels in order to match the way resources have
been allocated.

Signed-off-by: Christophe JAILLET 
---
v2: update goto label if 'xadc->ops->setup()' fails
---
 drivers/iio/adc/xilinx-xadc-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
b/drivers/iio/adc/xilinx-xadc-core.c
index 0a6beb3d99cb..515b91963db5 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev)
}
clk_prepare_enable(xadc->clk);
 
ret = xadc->ops->setup(pdev, indio_dev, irq);
if (ret)
-   goto err_free_samplerate_trigger;
+   goto err_clk_disable_unprepare;
 
ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
dev_name(>dev), indio_dev);
if (ret)
goto err_clk_disable_unprepare;
@@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
 
 err_free_irq:
free_irq(irq, indio_dev);
+err_clk_disable_unprepare:
+   clk_disable_unprepare(xadc->clk);
 err_free_samplerate_trigger:
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
iio_trigger_free(xadc->samplerate_trigger);
@@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
 err_triggered_buffer_cleanup:
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
iio_triggered_buffer_cleanup(indio_dev);
-err_clk_disable_unprepare:
-   clk_disable_unprepare(xadc->clk);
 err_device_free:
kfree(indio_dev->channels);
 
-- 
2.9.3