staging: speakup: Clean up if conditions
authorSreya Mittal <sreyamittal5@gmail.com>
Tue, 28 Feb 2017 21:08:13 +0000 (02:38 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Mar 2017 08:39:54 +0000 (09:39 +0100)
Found by checkpatch.pl
Logical conditions are on the next line, useless parentheses present
Clean up the if tests by

* Put logical conditions on the previous line
* Line up the tests

Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/keyhelp.c

index f5156bba4d55b18a9b88c6cf4d7e6821a2d7f216..4e6e5daba50c7ebbaf1df565e2967da1119cef3e 100644 (file)
@@ -163,17 +163,15 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
                }
                cur_item = letter_offsets[ch - 'a'];
        } else if (type == KT_CUR) {
-               if (ch == 0
-                   && (MSG_FUNCNAMES_START + cur_item + 1) <=
-                   MSG_FUNCNAMES_END)
+               if (ch == 0 &&
+                   (MSG_FUNCNAMES_START + cur_item + 1) <= MSG_FUNCNAMES_END)
                        cur_item++;
                else if (ch == 3 && cur_item > 0)
                        cur_item--;
                else
                        return -1;
-       } else if (type == KT_SPKUP
-                       && ch == SPEAKUP_HELP
-                       && !spk_special_handler) {
+       } else if (type == KT_SPKUP && ch == SPEAKUP_HELP &&
+                  !spk_special_handler) {
                spk_special_handler = spk_handle_help;
                synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
                build_key_data(); /* rebuild each time in case new mapping */