iio: adc: ti-ads1018: Drop iio_device_claim_buffer_mode() call

[PATCH] iio: adc: ti-ads1018: Drop iio_device_claim_buffer_mode() call

Posted by Kurt Borja 1 month, 3 weeks ago

Drop iio_device_claim_buffer_mode() call in ads1018_trigger_handler() as
it's not actually protecting anything.

Signed-off-by: Kurt Borja <kuurtb@gmail.com>
---
 drivers/iio/adc/ti-ads1018.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/iio/adc/ti-ads1018.c b/drivers/iio/adc/ti-ads1018.c
index af08702b62d2..b34184f68e63 100644
--- a/drivers/iio/adc/ti-ads1018.c
+++ b/drivers/iio/adc/ti-ads1018.c
@@ -557,9 +557,6 @@ static irqreturn_t ads1018_trigger_handler(int irq, void *p)
 	} scan = {};
 	int ret;
 
-	if (iio_device_claim_buffer_mode(indio_dev))
-		goto out_notify_done;
-
 	if (iio_trigger_using_own(indio_dev)) {
 		disable_irq(ads1018->drdy_irq);
 		ret = ads1018_spi_read_exclusive(ads1018, &scan.conv, true);
@@ -568,14 +565,11 @@ static irqreturn_t ads1018_trigger_handler(int irq, void *p)
 		ret = spi_read(ads1018->spi, ads1018->rx_buf, sizeof(ads1018->rx_buf));
 		scan.conv = ads1018->rx_buf[0];
 	}
-	if (ret)
-		goto out_release_buffer;
 
-	iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan), pf->timestamp);
+	if (!ret)
+		iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan),
+					    pf->timestamp);
 
-out_release_buffer:
-	iio_device_release_buffer_mode(indio_dev);
-out_notify_done:
 	iio_trigger_notify_done(indio_dev->trig);
 
 	return IRQ_HANDLED;

---
base-commit: a7b10f0963c651a6406d958a5f64b9c5594f84da
change-id: 20251216-ads1018-patch-ad02382e0a04

-- 
 ~ Kurt

Re: [PATCH] iio: adc: ti-ads1018: Drop iio_device_claim_buffer_mode() call

Posted by Jonathan Cameron 1 month, 2 weeks ago

On Tue, 16 Dec 2025 19:52:01 -0500
Kurt Borja <kuurtb@gmail.com> wrote:

> Drop iio_device_claim_buffer_mode() call in ads1018_trigger_handler() as
> it's not actually protecting anything.
> 
> Signed-off-by: Kurt Borja <kuurtb@gmail.com>
I squashed this in.  One comment inline.
> ---
>  drivers/iio/adc/ti-ads1018.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/iio/adc/ti-ads1018.c b/drivers/iio/adc/ti-ads1018.c
> index af08702b62d2..b34184f68e63 100644
> --- a/drivers/iio/adc/ti-ads1018.c
> +++ b/drivers/iio/adc/ti-ads1018.c
> @@ -557,9 +557,6 @@ static irqreturn_t ads1018_trigger_handler(int irq, void *p)
>  	} scan = {};
>  	int ret;
>  
> -	if (iio_device_claim_buffer_mode(indio_dev))
> -		goto out_notify_done;
> -
>  	if (iio_trigger_using_own(indio_dev)) {
>  		disable_irq(ads1018->drdy_irq);
>  		ret = ads1018_spi_read_exclusive(ads1018, &scan.conv, true);
> @@ -568,14 +565,11 @@ static irqreturn_t ads1018_trigger_handler(int irq, void *p)
>  		ret = spi_read(ads1018->spi, ads1018->rx_buf, sizeof(ads1018->rx_buf));
>  		scan.conv = ads1018->rx_buf[0];
>  	}
> -	if (ret)
> -		goto out_release_buffer;
>  
> -	iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan), pf->timestamp);
> +	if (!ret)
Generally I fairly strongly prefer error paths out of line but in this
case I'd rather just get this merged than go around again so I'll leave
this as it stands.

Thanks,

Jonathan

> +		iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan),
> +					    pf->timestamp);
>  
> -out_release_buffer:
> -	iio_device_release_buffer_mode(indio_dev);
> -out_notify_done:
>  	iio_trigger_notify_done(indio_dev->trig);
>  
>  	return IRQ_HANDLED;
> 
> ---
> base-commit: a7b10f0963c651a6406d958a5f64b9c5594f84da
> change-id: 20251216-ads1018-patch-ad02382e0a04
>

Re: [PATCH] iio: adc: ti-ads1018: Drop iio_device_claim_buffer_mode() call

Posted by Kurt Borja 1 month, 2 weeks ago

On Sun Dec 21, 2025 at 1:49 PM -05, Jonathan Cameron wrote:
> On Tue, 16 Dec 2025 19:52:01 -0500
> Kurt Borja <kuurtb@gmail.com> wrote:
>
>> Drop iio_device_claim_buffer_mode() call in ads1018_trigger_handler() as
>> it's not actually protecting anything.
>> 
>> Signed-off-by: Kurt Borja <kuurtb@gmail.com>
> I squashed this in.  One comment inline.
>> ---
>>  drivers/iio/adc/ti-ads1018.c | 12 +++---------
>>  1 file changed, 3 insertions(+), 9 deletions(-)
>> 
>> diff --git a/drivers/iio/adc/ti-ads1018.c b/drivers/iio/adc/ti-ads1018.c
>> index af08702b62d2..b34184f68e63 100644
>> --- a/drivers/iio/adc/ti-ads1018.c
>> +++ b/drivers/iio/adc/ti-ads1018.c
>> @@ -557,9 +557,6 @@ static irqreturn_t ads1018_trigger_handler(int irq, void *p)
>>  	} scan = {};
>>  	int ret;
>>  
>> -	if (iio_device_claim_buffer_mode(indio_dev))
>> -		goto out_notify_done;
>> -
>>  	if (iio_trigger_using_own(indio_dev)) {
>>  		disable_irq(ads1018->drdy_irq);
>>  		ret = ads1018_spi_read_exclusive(ads1018, &scan.conv, true);
>> @@ -568,14 +565,11 @@ static irqreturn_t ads1018_trigger_handler(int irq, void *p)
>>  		ret = spi_read(ads1018->spi, ads1018->rx_buf, sizeof(ads1018->rx_buf));
>>  		scan.conv = ads1018->rx_buf[0];
>>  	}
>> -	if (ret)
>> -		goto out_release_buffer;
>>  
>> -	iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan), pf->timestamp);
>> +	if (!ret)
> Generally I fairly strongly prefer error paths out of line but in this
> case I'd rather just get this merged than go around again so I'll leave
> this as it stands.

Apologies, I'll keep it in mind.

Thanks, Jonathan!

-- 
 ~ Kurt