]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Input: mark expected switch fall-throughs
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Mon, 6 Aug 2018 22:31:02 +0000 (15:31 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 8 Aug 2018 18:23:27 +0000 (11:23 -0700)
In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Warning level 2 was used: -Wimplicit-fallthrough=2

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/joystick/db9.c
drivers/input/keyboard/adp5589-keys.c
drivers/input/mouse/appletouch.c
drivers/input/mouse/cyapa_gen5.c
drivers/input/mouse/cyapa_gen6.c
drivers/input/mouse/elantech.c
drivers/input/mouse/sermouse.c
drivers/input/touchscreen/elo.c

index 7721cc0bf569a04a26fdcd78855c17909ad3babd..804b1b80a8bec77a24d5dca49543e71b1e66669d 100644 (file)
@@ -259,6 +259,7 @@ static unsigned char db9_saturn_read_packet(struct parport *port, unsigned char
                        db9_saturn_write_sub(port, type, 3, powered, 0);
                        return data[0] = 0xe3;
                }
+               /* else: fall through */
        default:
                return data[0];
        }
@@ -278,11 +279,14 @@ static int db9_saturn_report(unsigned char id, unsigned char data[60], struct in
                switch (data[j]) {
                case 0x16: /* multi controller (analog 4 axis) */
                        input_report_abs(dev, db9_abs[5], data[j + 6]);
+                       /* fall through */
                case 0x15: /* mission stick (analog 3 axis) */
                        input_report_abs(dev, db9_abs[3], data[j + 4]);
                        input_report_abs(dev, db9_abs[4], data[j + 5]);
+                       /* fall through */
                case 0x13: /* racing controller (analog 1 axis) */
                        input_report_abs(dev, db9_abs[2], data[j + 3]);
+                       /* fall through */
                case 0x34: /* saturn keyboard (udlr ZXC ASD QE Esc) */
                case 0x02: /* digital pad (digital 2 axis + buttons) */
                        input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
@@ -376,6 +380,7 @@ static void db9_timer(struct timer_list *t)
                        input_report_abs(dev2, ABS_X, (data & DB9_RIGHT ? 0 : 1) - (data & DB9_LEFT ? 0 : 1));
                        input_report_abs(dev2, ABS_Y, (data & DB9_DOWN  ? 0 : 1) - (data & DB9_UP   ? 0 : 1));
                        input_report_key(dev2, BTN_TRIGGER, ~data & DB9_FIRE1);
+                       /* fall through */
 
                case DB9_MULTI_0802:
 
index 32d94c63dc336eb72b4e11ed4ab7ed1c3055e879..2835fba71c33bfedcff74b2a54731ae1447f97da 100644 (file)
@@ -885,6 +885,7 @@ static int adp5589_probe(struct i2c_client *client,
        switch (id->driver_data) {
        case ADP5585_02:
                kpad->support_row5 = true;
+               /* fall through */
        case ADP5585_01:
                kpad->is_adp5585 = true;
                kpad->var = &const_adp5585;
index f593ec96c95f73992ac40952554a17896c75190c..f1e66e257cff7843d93c3f1f10dcf2311b805b3b 100644 (file)
@@ -472,6 +472,7 @@ static int atp_status_check(struct urb *urb)
                                dev->info->datalen, dev->urb->actual_length);
                        dev->overflow_warned = true;
                }
+               /* fall through */
        case -ECONNRESET:
        case -ENOENT:
        case -ESHUTDOWN:
index 5775d40b3d53994a754bd0f5a159adafbea65c3e..14239fbd72cf2032e193558dca87833ce4df4afd 100644 (file)
@@ -2554,6 +2554,7 @@ static int cyapa_gen5_do_operational_check(struct cyapa *cyapa)
                }
 
                cyapa->state = CYAPA_STATE_GEN5_APP;
+               /* fall through */
 
        case CYAPA_STATE_GEN5_APP:
                /*
index 016397850b1b0a488d08c0b1b37af6ea3a37a0fa..c1b524ab46232eee6115cab4a8ac4491a136601f 100644 (file)
@@ -680,6 +680,7 @@ static int cyapa_gen6_operational_check(struct cyapa *cyapa)
                }
 
                cyapa->state = CYAPA_STATE_GEN6_APP;
+               /* fall through */
 
        case CYAPA_STATE_GEN6_APP:
                /*
index fb4d902c440345d3cbc02329ed742d48b931dc85..d443067fc837c12c2a01910e067aad96607ce972 100644 (file)
@@ -340,7 +340,7 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse)
                 */
                if (packet[3] & 0x80)
                        fingers = 4;
-               /* pass through... */
+               /* fall through */
        case 1:
                /*
                 * byte 1:  .   .   .   .  x11 x10 x9  x8
index d27816ac038fe9e185dc917bd01d114361687880..3e8fb8136452e3fc19c4530189b559facd10c600 100644 (file)
@@ -139,7 +139,8 @@ static void sermouse_process_ms(struct sermouse *sermouse, signed char data)
                        switch (sermouse->type) {
 
                                case SERIO_MS:
-                                        sermouse->type = SERIO_MP;
+                                       sermouse->type = SERIO_MP;
+                                       /* fall through */
 
                                case SERIO_MP:
                                        if ((data >> 2) & 3) break;     /* M++ Wireless Extension packet. */
@@ -150,6 +151,7 @@ static void sermouse_process_ms(struct sermouse *sermouse, signed char data)
                                case SERIO_MZP:
                                case SERIO_MZPP:
                                        input_report_key(dev, BTN_SIDE,   (data >> 5) & 1);
+                                       /* fall through */
 
                                case SERIO_MZ:
                                        input_report_key(dev, BTN_MIDDLE, (data >> 4) & 1);
index 83433e8efff7066c864f61268c023ac946f90151..7f2942f3cec6e6290e9edbba7b470e183be68597 100644 (file)
@@ -352,6 +352,7 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
 
        case 1: /* 6-byte protocol */
                input_set_abs_params(input_dev, ABS_PRESSURE, 0, 15, 0, 0);
+               /* fall through */
 
        case 2: /* 4-byte protocol */
                input_set_abs_params(input_dev, ABS_X, 96, 4000, 0, 0);