lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firewire: mark expected switch fall-throughs

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

This patch fixes the following warnings:

drivers/firewire/core-device.c: In function ‘set_broadcast_channel’:
drivers/firewire/core-device.c:969:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
    if (data & cpu_to_be32(1 << 31)) {
       ^
drivers/firewire/core-device.c:974:3: note: here
   case RCODE_ADDRESS_ERROR:
   ^~~~
drivers/firewire/core-iso.c: In function ‘manage_channel’:
drivers/firewire/core-iso.c:308:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
    if ((data[0] & bit) == (data[1] & bit))
       ^
drivers/firewire/core-iso.c:312:3: note: here
   default:
   ^~~~~~~
drivers/firewire/core-topology.c: In function ‘count_ports’:
drivers/firewire/core-topology.c:69:23: warning: this statement may fall through [-Wimplicit-fallthrough=]
    (*child_port_count)++;
    ~~~~~~~~~~~~~~~~~~~^~
drivers/firewire/core-topology.c:70:3: note: here
   case SELFID_PORT_PARENT:
   ^~~~

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

Notice that in some cases, 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.

Cc: Kees Cook <keescook@chromium.org>
Cc: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (reworded a comment)
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
This commit is contained in:
Gustavo A. R. Silva 2019-02-11 11:48:21 -06:00
parent 5f9e832c13
commit eba6120de9
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firewire/core-device.c
View File

@ -957,7 +957,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
device->bc_implemented = BC_IMPLEMENTED; device->bc_implemented = BC_IMPLEMENTED;
break; break;
} }
/* else fall through to case address error */ /* else, fall through - to case address error */
case RCODE_ADDRESS_ERROR: case RCODE_ADDRESS_ERROR:
device->bc_implemented = BC_UNIMPLEMENTED; device->bc_implemented = BC_UNIMPLEMENTED;
} }

2
drivers/firewire/core-iso.c
View File

@ -284,7 +284,7 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,
if ((data[0] & bit) == (data[1] & bit)) if ((data[0] & bit) == (data[1] & bit))
continue; continue;
/* 1394-1995 IRM, fall through to retry. */ /* fall through - It's a 1394-1995 IRM, retry. */
default: default:
if (retry) { if (retry) {
retry--; retry--;

1
drivers/firewire/core-topology.c
View File

@ -54,6 +54,7 @@ static u32 *count_ports(u32 *sid, int *total_port_count, int *child_port_count)
switch (port_type) { switch (port_type) {
case SELFID_PORT_CHILD: case SELFID_PORT_CHILD:
(*child_port_count)++; (*child_port_count)++;
/* fall through */
case SELFID_PORT_PARENT: case SELFID_PORT_PARENT:
case SELFID_PORT_NCONN: case SELFID_PORT_NCONN:
(*total_port_count)++; (*total_port_count)++;