Commit 6f49c4f5 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Dmitry Torokhov
Browse files

Input: Use fallthrough pseudo-keyword 

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through



Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20200707180857.GA30600@embeddedor


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 08a6caae

drivers/input/joystick/db9.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ static unsigned char db9_saturn_read_packet(struct parport *port, unsigned char 
			db9_saturn_write_sub(port, type, 3, powered, 0);

			db9_saturn_write_sub(port, type, 3, powered, 0);

			return data[0] = 0xe3;

			return data[0] = 0xe3;

		}

		}

		/* fall through */

		fallthrough;

	default:

	default:

		return data[0];

		return data[0];

	}

	}
@@ -267,14 +267,14 @@ static int db9_saturn_report(unsigned char id, unsigned char data[60], struct in 
		switch (data[j]) {

		switch (data[j]) {

		case 0x16: /* multi controller (analog 4 axis) */

		case 0x16: /* multi controller (analog 4 axis) */

			input_report_abs(dev, db9_abs[5], data[j + 6]);

			input_report_abs(dev, db9_abs[5], data[j + 6]);

			/* fall through */

			fallthrough;

		case 0x15: /* mission stick (analog 3 axis) */

		case 0x15: /* mission stick (analog 3 axis) */

			input_report_abs(dev, db9_abs[3], data[j + 4]);

			input_report_abs(dev, db9_abs[3], data[j + 4]);

			input_report_abs(dev, db9_abs[4], data[j + 5]);

			input_report_abs(dev, db9_abs[4], data[j + 5]);

			/* fall through */

			fallthrough;

		case 0x13: /* racing controller (analog 1 axis) */

		case 0x13: /* racing controller (analog 1 axis) */

			input_report_abs(dev, db9_abs[2], data[j + 3]);

			input_report_abs(dev, db9_abs[2], data[j + 3]);

			/* fall through */

			fallthrough;

		case 0x34: /* saturn keyboard (udlr ZXC ASD QE Esc) */

		case 0x34: /* saturn keyboard (udlr ZXC ASD QE Esc) */

		case 0x02: /* digital pad (digital 2 axis + buttons) */

		case 0x02: /* digital pad (digital 2 axis + buttons) */

			input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));

			input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
@@ -368,7 +368,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_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_abs(dev2, ABS_Y, (data & DB9_DOWN  ? 0 : 1) - (data & DB9_UP   ? 0 : 1));

			input_report_key(dev2, BTN_TRIGGER, ~data & DB9_FIRE1);

			input_report_key(dev2, BTN_TRIGGER, ~data & DB9_FIRE1);

			/* fall through */

			fallthrough;





		case DB9_MULTI_0802:

		case DB9_MULTI_0802:

drivers/input/joystick/gamecon.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -485,7 +485,7 @@ static void gc_multi_process_packet(struct gc *gc) 
		switch (pad->type) {

		switch (pad->type) {

		case GC_MULTI2:

		case GC_MULTI2:

			input_report_key(dev, BTN_THUMB, s & data[5]);

			input_report_key(dev, BTN_THUMB, s & data[5]);

			/* fall through */

			fallthrough;





		case GC_MULTI:

		case GC_MULTI:

			input_report_abs(dev, ABS_X,

			input_report_abs(dev, ABS_X,
@@ -638,7 +638,7 @@ static void gc_psx_report_one(struct gc_pad *pad, unsigned char psx_type, 




		input_report_key(dev, BTN_THUMBL, ~data[0] & 0x04);

		input_report_key(dev, BTN_THUMBL, ~data[0] & 0x04);

		input_report_key(dev, BTN_THUMBR, ~data[0] & 0x02);

		input_report_key(dev, BTN_THUMBR, ~data[0] & 0x02);

		/* fall through */

		fallthrough;





	case GC_PSX_NEGCON:

	case GC_PSX_NEGCON:

	case GC_PSX_ANALOG:

	case GC_PSX_ANALOG:
@@ -872,7 +872,8 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type) 
	case GC_SNES:

	case GC_SNES:

		for (i = 4; i < 8; i++)

		for (i = 4; i < 8; i++)

			input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);

			input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);

		/* fall through */

		fallthrough;



	case GC_NES:

	case GC_NES:

		for (i = 0; i < 4; i++)

		for (i = 0; i < 4; i++)

			input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);

			input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);
@@ -880,7 +881,8 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type) 




	case GC_MULTI2:

	case GC_MULTI2:

		input_set_capability(input_dev, EV_KEY, BTN_THUMB);

		input_set_capability(input_dev, EV_KEY, BTN_THUMB);

		/* fall through */

		fallthrough;



	case GC_MULTI:

	case GC_MULTI:

		input_set_capability(input_dev, EV_KEY, BTN_TRIGGER);

		input_set_capability(input_dev, EV_KEY, BTN_TRIGGER);

		/* fall through */

		/* fall through */

drivers/input/joystick/sidewinder.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -656,16 +656,19 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv) 




			switch (i * m) {

			switch (i * m) {

				case 60:

				case 60:

					sw->number++;			/* fall through */

					sw->number++;

					fallthrough;

				case 45:				/* Ambiguous packet length */

				case 45:				/* Ambiguous packet length */

					if (j <= 40) {			/* ID length less or eq 40 -> FSP */

					if (j <= 40) {			/* ID length less or eq 40 -> FSP */

				case 43:

				case 43:

						sw->type = SW_ID_FSP;

						sw->type = SW_ID_FSP;

						break;

						break;

					}

					}

					sw->number++;			/* fall through */

					sw->number++;

					fallthrough;

				case 30:

				case 30:

					sw->number++;			/* fall through */

					sw->number++;

					fallthrough;

				case 15:

				case 15:

					sw->type = SW_ID_GP;

					sw->type = SW_ID_GP;

					break;

					break;
@@ -681,9 +684,11 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv) 
						sw->type = SW_ID_PP;

						sw->type = SW_ID_PP;

					break;

					break;

				case 66:

				case 66:

					sw->bits = 3;			/* fall through */

					sw->bits = 3;

					fallthrough;

				case 198:

				case 198:

					sw->length = 22;		/* fall through */

					sw->length = 22;

					fallthrough;

				case 64:

				case 64:

					sw->type = SW_ID_3DP;

					sw->type = SW_ID_3DP;

					if (j == 160)

					if (j == 160)

drivers/input/joystick/spaceball.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ static irqreturn_t spaceball_interrupt(struct serio *serio, 
				break;

				break;

			}

			}

			spaceball->escape = 0;

			spaceball->escape = 0;

			/* fall through */

			fallthrough;

		case 'M':

		case 'M':

		case 'Q':

		case 'Q':

		case 'S':

		case 'S':
@@ -154,7 +154,7 @@ static irqreturn_t spaceball_interrupt(struct serio *serio, 
				spaceball->escape = 0;

				spaceball->escape = 0;

				data &= 0x1f;

				data &= 0x1f;

			}

			}

			/* fall through */

			fallthrough;

		default:

		default:

			if (spaceball->escape)

			if (spaceball->escape)

				spaceball->escape = 0;

				spaceball->escape = 0;
@@ -220,13 +220,13 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv) 
			input_dev->keybit[BIT_WORD(BTN_A)] |= BIT_MASK(BTN_A) |

			input_dev->keybit[BIT_WORD(BTN_A)] |= BIT_MASK(BTN_A) |

				BIT_MASK(BTN_B) | BIT_MASK(BTN_C) |

				BIT_MASK(BTN_B) | BIT_MASK(BTN_C) |

				BIT_MASK(BTN_MODE);

				BIT_MASK(BTN_MODE);

			/* fall through */

			fallthrough;

		default:

		default:

			input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_2) |

			input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_2) |

				BIT_MASK(BTN_3) | BIT_MASK(BTN_4) |

				BIT_MASK(BTN_3) | BIT_MASK(BTN_4) |

				BIT_MASK(BTN_5) | BIT_MASK(BTN_6) |

				BIT_MASK(BTN_5) | BIT_MASK(BTN_6) |

				BIT_MASK(BTN_7) | BIT_MASK(BTN_8);

				BIT_MASK(BTN_7) | BIT_MASK(BTN_8);

			/* fall through */

			fallthrough;

		case SPACEBALL_3003C:

		case SPACEBALL_3003C:

			input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_1) |

			input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_1) |

				BIT_MASK(BTN_8);

				BIT_MASK(BTN_8);

drivers/input/keyboard/adp5589-keys.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1016,7 +1016,7 @@ static int adp5589_probe(struct i2c_client *client, 
	switch (id->driver_data) {

	switch (id->driver_data) {

	case ADP5585_02:

	case ADP5585_02:

		kpad->support_row5 = true;

		kpad->support_row5 = true;

		/* fall through */

		fallthrough;

	case ADP5585_01:

	case ADP5585_01:

		kpad->is_adp5585 = true;

		kpad->is_adp5585 = true;

		kpad->var = &const_adp5585;

		kpad->var = &const_adp5585;