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,
                                      &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 = {
        /* 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)