[PATCH] ipmi/watchdog: replace atomic_add() and atomic_sub()

[PATCH] ipmi/watchdog: replace atomic_add() and atomic_sub()

[Yejune Deng]

atomic_inc() and atomic_dec() looks better

Signed-off-by: Yejune Deng <yejune.deng@gmail.com>
---
 drivers/char/ipmi/ipmi_watchdog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index f78156d..32c334e 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -495,7 +495,7 @@ static void panic_halt_ipmi_heartbeat(void)
 	msg.cmd = IPMI_WDOG_RESET_TIMER;
 	msg.data = NULL;
 	msg.data_len = 0;
-	atomic_add(1, &panic_done_count);
+	atomic_inc(&panic_done_count);
 	rv = ipmi_request_supply_msgs(watchdog_user,
 				      (struct ipmi_addr *) &addr,
 				      0,
@@ -505,7 +505,7 @@ static void panic_halt_ipmi_heartbeat(void)
 				      &panic_halt_heartbeat_recv_msg,
 				      1);
 	if (rv)
-		atomic_sub(1, &panic_done_count);
+		atomic_dec(&panic_done_count);
 }
 
 static struct ipmi_smi_msg panic_halt_smi_msg = {
@@ -529,12 +529,12 @@ static void panic_halt_ipmi_set_timeout(void)
 	/* Wait for the messages to be free. */
 	while (atomic_read(&panic_done_count) != 0)
 		ipmi_poll_interface(watchdog_user);
-	atomic_add(1, &panic_done_count);
+	atomic_inc(&panic_done_count);
 	rv = __ipmi_set_timeout(&panic_halt_smi_msg,
 				&panic_halt_recv_msg,
 				&send_heartbeat_now);
 	if (rv) {
-		atomic_sub(1, &panic_done_count);
+		atomic_dec(&panic_done_count);
 		pr_warn("Unable to extend the watchdog timeout\n");
 	} else {
 		if (send_heartbeat_now)
-- 
1.9.1

Re: [PATCH] ipmi/watchdog: replace atomic_add() and atomic_sub()

[Corey Minyard]

On Mon, Nov 16, 2020 at 03:30:07PM +0800, Yejune Deng wrote:
> atomic_inc() and atomic_dec() looks better

Yes, that's a little neater.  Queued for next release.

Thanks,

-corey

> 
> Signed-off-by: Yejune Deng <yejune.deng@gmail.com>
> ---
>  drivers/char/ipmi/ipmi_watchdog.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
> index f78156d..32c334e 100644
> --- a/drivers/char/ipmi/ipmi_watchdog.c
> +++ b/drivers/char/ipmi/ipmi_watchdog.c
> @@ -495,7 +495,7 @@ static void panic_halt_ipmi_heartbeat(void)
>  	msg.cmd = IPMI_WDOG_RESET_TIMER;
>  	msg.data = NULL;
>  	msg.data_len = 0;
> -	atomic_add(1, &panic_done_count);
> +	atomic_inc(&panic_done_count);
>  	rv = ipmi_request_supply_msgs(watchdog_user,
>  				      (struct ipmi_addr *) &addr,
>  				      0,
> @@ -505,7 +505,7 @@ static void panic_halt_ipmi_heartbeat(void)
>  				      &panic_halt_heartbeat_recv_msg,
>  				      1);
>  	if (rv)
> -		atomic_sub(1, &panic_done_count);
> +		atomic_dec(&panic_done_count);
>  }
>  
>  static struct ipmi_smi_msg panic_halt_smi_msg = {
> @@ -529,12 +529,12 @@ static void panic_halt_ipmi_set_timeout(void)
>  	/* Wait for the messages to be free. */
>  	while (atomic_read(&panic_done_count) != 0)
>  		ipmi_poll_interface(watchdog_user);
> -	atomic_add(1, &panic_done_count);
> +	atomic_inc(&panic_done_count);
>  	rv = __ipmi_set_timeout(&panic_halt_smi_msg,
>  				&panic_halt_recv_msg,
>  				&send_heartbeat_now);
>  	if (rv) {
> -		atomic_sub(1, &panic_done_count);
> +		atomic_dec(&panic_done_count);
>  		pr_warn("Unable to extend the watchdog timeout\n");
>  	} else {
>  		if (send_heartbeat_now)
> -- 
> 1.9.1
>