Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-block.git] / drivers / char / nwbutton.c

diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 76c490fa051103b99ba6b1006f7b8c2ed2a575a2..0e184426db98ed956c9d25bfb9566f608711980d 100644 (file)
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -129,10 +129,9 @@ static void button_consume_callbacks (int bpcount)
 
 static void button_sequence_finished (unsigned long parameters)
 {
-#ifdef CONFIG_NWBUTTON_REBOOT          /* Reboot using button is enabled */
-       if (button_press_count == reboot_count)
+       if (IS_ENABLED(CONFIG_NWBUTTON_REBOOT) &&
+           button_press_count == reboot_count)
                kill_cad_pid(SIGINT, 1);        /* Ask init to reboot us */
-#endif /* CONFIG_NWBUTTON_REBOOT */
        button_consume_callbacks (button_press_count);
        bcount = sprintf (button_output_buffer, "%d\n", button_press_count);
        button_press_count = 0;         /* Reset the button press counter */