diff mbox series

[next] iio: pressure: rohm-bm1390: Remove redundant if statement

Message ID 20241010170835.772764-1-colin.i.king@gmail.com (mailing list archive)
State Accepted
Headers show
Series [next] iio: pressure: rohm-bm1390: Remove redundant if statement | expand

Commit Message

Colin Ian King Oct. 10, 2024, 5:08 p.m. UTC 
From: Colin Ian King <colin.i.king@intel.com>

There is a check on non-zero ret that is redundant because the
same check is being performed in a previous if statement and
also before that. The check is not required, remove it.

Signed-off-by: Colin Ian King <colin.i.king@intel.com>
---
 drivers/iio/pressure/rohm-bm1390.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Jonathan Cameron Oct. 10, 2024, 6:07 p.m. UTC | #1 
On Thu, 10 Oct 2024 18:08:35 +0100
Colin Ian King <colin.i.king@gmail.com> wrote:

> From: Colin Ian King <colin.i.king@intel.com>
> 
> There is a check on non-zero ret that is redundant because the
> same check is being performed in a previous if statement and
> also before that. The check is not required, remove it.
> 
> Signed-off-by: Colin Ian King <colin.i.king@intel.com>
Applied.  Thanks,

Jonathan

> ---
>  drivers/iio/pressure/rohm-bm1390.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/iio/pressure/rohm-bm1390.c b/drivers/iio/pressure/rohm-bm1390.c
> index ccaa07a569c9..f24d9f927681 100644
> --- a/drivers/iio/pressure/rohm-bm1390.c
> +++ b/drivers/iio/pressure/rohm-bm1390.c
> @@ -410,23 +410,20 @@ static int __bm1390_fifo_flush(struct iio_dev *idev, unsigned int samples,
>  	if (ret)
>  		return ret;
>  
>  	if (test_bit(BM1390_CHAN_TEMP, idev->active_scan_mask)) {
>  		ret = regmap_bulk_read(data->regmap, BM1390_REG_TEMP_HI, &temp,
>  				       sizeof(temp));
>  		if (ret)
>  			return ret;
>  	}
>  
> -	if (ret)
> -		return ret;
> -
>  	for (i = 0; i < smp_lvl; i++) {
>  		buffer[i].temp = temp;
>  		iio_push_to_buffers(idev, &buffer[i]);
>  	}
>  
>  	return smp_lvl;
>  }
>  
>  static int bm1390_fifo_flush(struct iio_dev *idev, unsigned int samples)
>  {
Matti Vaittinen Oct. 11, 2024, 9:38 a.m. UTC | #2 
On 10/10/2024 20:08, Colin Ian King wrote:
> From: Colin Ian King <colin.i.king@intel.com>
> 
> There is a check on non-zero ret that is redundant because the
> same check is being performed in a previous if statement and
> also before that. The check is not required, remove it.
> 
> Signed-off-by: Colin Ian King <colin.i.king@intel.com>

Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>

Thanks!
diff mbox series

Patch

diff --git a/drivers/iio/pressure/rohm-bm1390.c b/drivers/iio/pressure/rohm-bm1390.c
index ccaa07a569c9..f24d9f927681 100644
--- a/drivers/iio/pressure/rohm-bm1390.c
+++ b/drivers/iio/pressure/rohm-bm1390.c
@@ -410,23 +410,20 @@  static int __bm1390_fifo_flush(struct iio_dev *idev, unsigned int samples,
 	if (ret)
 		return ret;
 
 	if (test_bit(BM1390_CHAN_TEMP, idev->active_scan_mask)) {
 		ret = regmap_bulk_read(data->regmap, BM1390_REG_TEMP_HI, &temp,
 				       sizeof(temp));
 		if (ret)
 			return ret;
 	}
 
-	if (ret)
-		return ret;
-
 	for (i = 0; i < smp_lvl; i++) {
 		buffer[i].temp = temp;
 		iio_push_to_buffers(idev, &buffer[i]);
 	}
 
 	return smp_lvl;
 }
 
 static int bm1390_fifo_flush(struct iio_dev *idev, unsigned int samples)
 {