input: Adjust structure of code in process_modifier()

Move all the '!release' code into one block so that it is clear that it only
applies on key release.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index ceed5a67ea8aebd52c19217912dbb4a41bbdbaff..a64bd87e19c6e966ccebd676035beef30ae95876 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -236,7 +236,6 @@ static struct input_key_xlate *process_modifier(struct input_config *config,
                                                int key, int release)
 {
        struct input_key_xlate *table;
-       int flip = -1;
        int i;
 
        /* Start with the main table, and see what modifiers change it */
@@ -251,6 +250,8 @@ static struct input_key_xlate *process_modifier(struct input_config *config,
 
        /* Handle the lighted keys */
        if (!release) {
+               int flip = -1;
+
                switch (key) {
                case KEY_SCROLLLOCK:
                        flip = FLAG_SCROLL_LOCK;
@@ -262,19 +263,19 @@ static struct input_key_xlate *process_modifier(struct input_config *config,
                        flip = FLAG_CAPS_LOCK;
                        break;
                }
-       }
 
-       if (flip != -1) {
-               int leds = 0;
-
-               config->leds ^= flip;
-               if (config->flags & FLAG_NUM_LOCK)
-                       leds |= INPUT_LED_NUM;
-               if (config->flags & FLAG_CAPS_LOCK)
-                       leds |= INPUT_LED_CAPS;
-               if (config->flags & FLAG_SCROLL_LOCK)
-                       leds |= INPUT_LED_SCROLL;
-               config->leds = leds;
+               if (flip != -1) {
+                       int leds = 0;
+
+                       config->leds ^= flip;
+                       if (config->flags & FLAG_NUM_LOCK)
+                               leds |= INPUT_LED_NUM;
+                       if (config->flags & FLAG_CAPS_LOCK)
+                               leds |= INPUT_LED_CAPS;
+                       if (config->flags & FLAG_SCROLL_LOCK)
+                               leds |= INPUT_LED_SCROLL;
+                       config->leds = leds;
+               }
        }
 
        return table;