Skip to contentSkip to conversation

ide: mark expected switch fall-through

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Feb 11, 2019 – Mar 10, 2019 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ide: mark expected switch fall-through

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/ide/ide-floppy.c: In function ‘ide_floppy_get_capacity’:
drivers/ide/ide-floppy.c:424:7: warning: this statement may fall through [-Wimplicit-fallthrough=]

    if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE))
       ^

drivers/ide/ide-floppy.c:431:3: note: here
case CAPACITY_CURRENT:
^~~~

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

Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

---
 drivers/ide/ide-floppy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ide/ide-floppy.c +1 -1
index 780d33ccc5d8..1ea2f9e82bf8 100644
@@ -427,7 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
 				 * (maintains previous driver behaviour)
 				 */
 				break;
-			/* else: fall through */
+			/* fall through */
 		case CAPACITY_CURRENT:
 			/* Normal Zip/LS-120 disks */
 			if (memcmp(cap_desc, &floppy->cap_desc, 8))
Signature · 1 line
2.20.1
Applied
#1 lore raw

From: "Gustavo A. R. Silva" <[email protected]>
Date: Mon, 11 Feb 2019 16:17:20 -0600

Quoted 15 lines

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/ide/ide-floppy.c: In function ‘ide_floppy_get_capacity’:
drivers/ide/ide-floppy.c:424:7: warning: this statement may fall through [-Wimplicit-fallthrough=]

    if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE))
       ^
drivers/ide/ide-floppy.c:431:3: note: here
   case CAPACITY_CURRENT:
   ^~~~

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

Quoted 7 lines

Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Applied.