[PATCH] staging: speakup: else is not generally useful after a break or return

[Arushi Singhal]

fixed checkpatch.pl warning: else is not generally useful after a break
or return.
Removed the else without affecting the logic.
Dead code is also eliminated.

Signed-off-by: Arushi Singhal <arushisinghal19971...@gmail.com>
---
 drivers/staging/speakup/keyhelp.c | 53 ++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c 
b/drivers/staging/speakup/keyhelp.c
index 4e6e5daba50c..ad3efded37c1 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -176,43 +176,28 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
u_char ch, u_short key)
                synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
                build_key_data(); /* rebuild each time in case new mapping */
                return 1;
-       } else {
-               name = NULL;
-               if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
-                       synth_printf("%s\n",
-                                    spk_msg_get(MSG_KEYNAMES_START + key - 1));
-                       return 1;
-               }
-               for (i = 0; funcvals[i] != 0 && !name; i++) {
-                       if (ch == funcvals[i])
-                               name = spk_msg_get(MSG_FUNCNAMES_START + i);
-               }
-               if (!name)
-                       return -1;
-               kp = spk_our_keys[key] + 1;
-               for (i = 0; i < nstates; i++) {
-                       if (ch == kp[i])
-                               break;
-               }
-               key += (state_tbl[i] << 8);
-               say_key(key);
-               synth_printf(spk_msg_get(MSG_KEYDESC), name);
-               synth_printf("\n");
-               return 1;
        }
-       name = spk_msg_get(MSG_FUNCNAMES_START + cur_item);
-       func = funcvals[cur_item];
-       synth_printf("%s", name);
-       if (key_offsets[func] == 0) {
-               synth_printf(" %s\n", spk_msg_get(MSG_IS_UNASSIGNED));
+
+       name = NULL;
+       if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
+               synth_printf("%s\n",
+                            spk_msg_get(MSG_KEYNAMES_START + key - 1));
                return 1;
        }
-       p_keys = key_data + key_offsets[func];
-       for (n = 0; p_keys[n]; n++) {
-               val = p_keys[n];
-               if (n > 0)
-                       synth_printf("%s ", spk_msg_get(MSG_DISJUNCTION));
-               say_key(val);
+       for (i = 0; funcvals[i] != 0 && !name; i++) {
+               if (ch == funcvals[i])
+                       name = spk_msg_get(MSG_FUNCNAMES_START + i);
+       }
+       if (!name)
+               return -1;
+       kp = spk_our_keys[key] + 1;
+       for (i = 0; i < nstates; i++) {
+               if (ch == kp[i])
+                       break;
        }
+       key += (state_tbl[i] << 8);
+       say_key(key);
+       synth_printf(spk_msg_get(MSG_KEYDESC), name);
+       synth_printf("\n");
        return 1;
 }
-- 
2.11.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel