Commit 383df634 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'Wimplicit-fallthrough-clang-5.14-rc1' of... 

Merge tag 'Wimplicit-fallthrough-clang-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull more fallthrough fixes from Gustavo Silva:
 "Fix maore fall-through warnings when building the kernel with clang
  and '-Wimplicit-fallthrough'"

* tag 'Wimplicit-fallthrough-clang-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  Input: Fix fall-through warning for Clang
  scsi: aic94xx: Fix fall-through warning for Clang
  i3c: master: cdns: Fix fall-through warning for Clang
  net/mlx4: Fix fall-through warning for Clang
parents b5e6d126 f1469e56

drivers/i3c/master/i3c-master-cdns.c

+2 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,8 @@ static void cnds_i3c_master_demux_ibis(struct cdns_i3c_master *master) 


		case IBIR_TYPE_MR:

			WARN_ON(IBIR_XFER_BYTES(ibir) || (ibir & IBIR_ERROR));

			break;



		default:

			break;

		}

drivers/input/joystick/sidewinder.c

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv) 
					fallthrough;

				case 45:				/* Ambiguous packet length */

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

					fallthrough;

				case 43:

						sw->type = SW_ID_FSP;

						break;

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+1 −0
Original line number Diff line number Diff line
@@ -2660,6 +2660,7 @@ int mlx4_FREE_RES_wrapper(struct mlx4_dev *dev, int slave, 
	case RES_XRCD:

		err = xrcdn_free_res(dev, slave, vhcr->op_modifier, alop,

				     vhcr->in_param, &vhcr->out_param);

		break;



	default:

		break;

drivers/scsi/aic94xx/aic94xx_sds.c

+3 −1
Original line number Diff line number Diff line
@@ -718,11 +718,13 @@ static void *asd_find_ll_by_id(void * const start, const u8 id0, const u8 id1) 
	do {

		switch (id1) {

		default:

			if (el->id1 == id1)

			if (el->id1 == id1) {

			fallthrough;

		case 0xFF:

				if (el->id0 == id0)

					return el;

			}

		}

		el = start + le16_to_cpu(el->next);

	} while (el != start);