Commit c71a2f65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fallthrough-fixes-clang-5.14-rc4' of...

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

Pull fallthrough fixes from Gustavo Silva:
 "Fix some fall-through warnings when building with Clang and
  '-Wimplicit-fallthrough' on ARM"

* tag 'fallthrough-fixes-clang-5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  scsi: fas216: Fix fall-through warning for Clang
  scsi: acornscsi: Fix fall-through warning for clang
  ARM: riscpc: Fix fall-through warning for Clang
parents cade08a5 cb163627
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int __init parse_tag_acorn(const struct tag *tag)
		fallthrough;	/* ??? */
	case 256:
		vram_size += PAGE_SIZE * 256;
		break;
	default:
		break;
	}
+1 −0
Original line number Diff line number Diff line
@@ -2642,6 +2642,7 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
//#endif
		clear_bit(SCpnt->device->id * 8 +
			  (u8)(SCpnt->device->lun & 0x7), host->busyluns);
		fallthrough;

	/*
	 * We found the command, and cleared it out.  Either
+1 −0
Original line number Diff line number Diff line
@@ -1375,6 +1375,7 @@ static void fas216_busservice_intr(FAS216_Info *info, unsigned int stat, unsigne
		case IS_COMPLETE:
			break;
		}
		break;

	default:
		break;