[PATCH v2] iio/imu: inv_icm42600: Use max() helper macros

[PATCH v2] iio/imu: inv_icm42600: Use max() helper macros

[Bragatheswaran Manickavel]

Use the standard max() helper macros instead of direct
variable comparison using if/else blocks or ternary
operator. Change identified using minmax.cocci
Coccinelle semantic patch.

Signed-off-by: Bragatheswaran Manickavel <bragathemanick0908@gmail.com>
---
V1 -> V2: Adding similar changes to inv_icm42600_gyro & inv_icm42600_buffer

 drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c  | 5 +----
 drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 5 +----
 drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c   | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
index b1e4fde27d25..f67bd5a39beb 100644
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
@@ -137,10 +137,7 @@ static int inv_icm42600_accel_update_scan_mode(struct iio_dev *indio_dev,
 out_unlock:
 	mutex_unlock(&st->lock);
 	/* sleep maximum required time */
-	if (sleep_accel > sleep_temp)
-		sleep = sleep_accel;
-	else
-		sleep = sleep_temp;
+	sleep = max(sleep_accel, sleep_temp);
 	if (sleep)
 		msleep(sleep);
 	return ret;
diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
index 6ef1df9d60b7..b52f328fd26c 100644
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
@@ -424,10 +424,7 @@ static int inv_icm42600_buffer_postdisable(struct iio_dev *indio_dev)
 	mutex_unlock(&st->lock);
 
 	/* sleep maximum required time */
-	if (sleep_sensor > sleep_temp)
-		sleep = sleep_sensor;
-	else
-		sleep = sleep_temp;
+	sleep = max(sleep_sensor, sleep_temp);
 	if (sleep)
 		msleep(sleep);
 
diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
index 3bf946e56e1d..3df0a715e885 100644
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
@@ -137,10 +137,7 @@ static int inv_icm42600_gyro_update_scan_mode(struct iio_dev *indio_dev,
 out_unlock:
 	mutex_unlock(&st->lock);
 	/* sleep maximum required time */
-	if (sleep_gyro > sleep_temp)
-		sleep = sleep_gyro;
-	else
-		sleep = sleep_temp;
+	sleep = max(sleep_gyro, sleep_temp);
 	if (sleep)
 		msleep(sleep);
 	return ret;
-- 
2.34.1

Re: [PATCH v2] iio/imu: inv_icm42600: Use max() helper macros

[Jonathan Cameron]

On Fri, 27 Oct 2023 15:19:49 +0000
Jean-Baptiste Maneyrol <Jean-Baptiste.Maneyrol@tdk.com> wrote:

> Hello,
> 
> thanks for the patch, looks good.
> 
> Acked-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>

Interestingly b4 isn't finding this tag.  I'm too lazy to look into why but
seems your email didn't reach patchwork either.
Applied it by hand whilst applying the patch to the togreg branch of iio.git
which given timing will be rebase on rc1 once available.  For now I'll just
push it out as testing to give 0-day a head start.


Jonathan

> 
> Thanks,
> JB
> 
> From: Bragatheswaran Manickavel <bragathemanick0908@gmail.com>
> Sent: Friday, October 27, 2023 11:44
> To: Jean-Baptiste Maneyrol <Jean-Baptiste.Maneyrol@tdk.com>; jic23@kernel.org <jic23@kernel.org>; lars@metafoo.de <lars@metafoo.de>
> Cc: Bragatheswaran Manickavel <bragathemanick0908@gmail.com>; linux-iio@vger.kernel.org <linux-iio@vger.kernel.org>; linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
> Subject: [PATCH v2] iio/imu: inv_icm42600: Use max() helper macros 
>  
> Use the standard max() helper macros instead of direct variable comparison using if/else blocks or ternary operator. Change identified using minmax. cocci Coccinelle semantic patch. Signed-off-by: Bragatheswaran Manickavel <bragathemanick0908@ gmail. com> 
> ZjQcmQRYFpfptBannerStart
> This Message Is From an Untrusted Sender 
> You have not previously corresponded with this sender. 
>  
> ZjQcmQRYFpfptBannerEnd
> Use the standard max() helper macros instead of direct
> variable comparison using if/else blocks or ternary
> operator. Change identified using minmax.cocci
> Coccinelle semantic patch.
> 
> Signed-off-by: Bragatheswaran Manickavel <bragathemanick0908@gmail.com>
> ---
> V1 -> V2: Adding similar changes to inv_icm42600_gyro & inv_icm42600_buffer
> 
>  drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c  | 5 +----
>  drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 5 +----
>  drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c   | 5 +----
>  3 files changed, 3 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
> index b1e4fde27d25..f67bd5a39beb 100644
> --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
> +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
> @@ -137,10 +137,7 @@ static int inv_icm42600_accel_update_scan_mode(struct iio_dev *indio_dev,
>  out_unlock:
>  	mutex_unlock(&st->lock);
>  	/* sleep maximum required time */
> -	if (sleep_accel > sleep_temp)
> -		sleep = sleep_accel;
> -	else
> -		sleep = sleep_temp;
> +	sleep = max(sleep_accel, sleep_temp);
>  	if (sleep)
>  		msleep(sleep);
>  	return ret;
> diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
> index 6ef1df9d60b7..b52f328fd26c 100644
> --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
> +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
> @@ -424,10 +424,7 @@ static int inv_icm42600_buffer_postdisable(struct iio_dev *indio_dev)
>  	mutex_unlock(&st->lock);
>  
>  	/* sleep maximum required time */
> -	if (sleep_sensor > sleep_temp)
> -		sleep = sleep_sensor;
> -	else
> -		sleep = sleep_temp;
> +	sleep = max(sleep_sensor, sleep_temp);
>  	if (sleep)
>  		msleep(sleep);
>  
> diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
> index 3bf946e56e1d..3df0a715e885 100644
> --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
> +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
> @@ -137,10 +137,7 @@ static int inv_icm42600_gyro_update_scan_mode(struct iio_dev *indio_dev,
>  out_unlock:
>  	mutex_unlock(&st->lock);
>  	/* sleep maximum required time */
> -	if (sleep_gyro > sleep_temp)
> -		sleep = sleep_gyro;
> -	else
> -		sleep = sleep_temp;
> +	sleep = max(sleep_gyro, sleep_temp);
>  	if (sleep)
>  		msleep(sleep);
>  	return ret;