Skip to contentSkip to conversation

firewire: annotate implicit fall through

PATCH In review Mathieu Malaterre 2 participants 5 messages Jan 14, 2019 – Mar 13, 2019 Firewire

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 firewire: annotate implicit fall through

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

In this particular case rewrote the comment to start with the string "fall through", so as to match the regular expression expected by GCC.

This commit remove the following warning:

drivers/firewire/core-iso.c:308:7: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/firewire/core-iso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firewire/core-iso.c +1 -1
index 35e784cffc23..d2d50bda5a5f 100644
@@ -308,7 +308,7 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,
 			if ((data[0] & bit) == (data[1] & bit))
 				continue;
 
-			/* 1394-1995 IRM, fall through to retry. */
+			/* fall through - 1394-1995 IRM to retry. */
 		default:
 			if (retry) {
 				retry--;
Signature · 1 line
2.19.2
#1 lore raw

PATCH 2/2 firewire: annotate implicit fall through

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

In this particular case add a ‘-’ so as to match the regular expression expected by GCC.

This commit remove the following warning:

/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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firewire/core-device.c +1 -1
index 7c2eed76011e..e41d55b04940 100644
@@ -970,7 +970,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
 				device->bc_implemented = BC_IMPLEMENTED;
 				break;
 			}
-			/* else fall through to case address error */
+			/* else fall through - to case address error */
 		case RCODE_ADDRESS_ERROR:
 			device->bc_implemented = BC_UNIMPLEMENTED;
 		}
Signature · 1 line
2.19.2
#2 lore raw
In reply to Mathieu Malaterre

ping ?

Quoted 32 lines · Mathieu Malaterre

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

In this particular case rewrote the comment to start with the string "fall through", so as to match the regular expression expected by GCC.

This commit remove the following warning:

drivers/firewire/core-iso.c:308:7: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/firewire/core-iso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firewire/core-iso.c +1 -2
index 35e784cffc23..d2d50bda5a5f 100644
@@ -308,7 +308,7 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,
                        if ((data[0] & bit) == (data[1] & bit))
                                continue;
 
-                       /* 1394-1995 IRM, fall through to retry. */
+                       /* fall through - 1394-1995 IRM to retry. */
                default:
                        if (retry) {
                                retry--;
--

2.19.2

#3 lore raw

Mathieu,

Quoted 2 lines · Mathieu Malaterre

ping ?

I have sent the following patch to address all these warnings in firewire:

https://lore.kernel.org/patchwork/patch/1040737/

and, as this is being ignored, I'll add it to my tree for 5.2.

Thanks
--
Gustavo

Quoted 33 lines · Mathieu Malaterre
Quoted 32 lines

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

In this particular case rewrote the comment to start with the string "fall through", so as to match the regular expression expected by GCC.

This commit remove the following warning:

drivers/firewire/core-iso.c:308:7: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/firewire/core-iso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firewire/core-iso.c +1 -2
index 35e784cffc23..d2d50bda5a5f 100644
@@ -308,7 +308,7 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,
                        if ((data[0] & bit) == (data[1] & bit))
                                continue;
 
-                       /* 1394-1995 IRM, fall through to retry. */
+                       /* fall through - 1394-1995 IRM to retry. */
                default:
                        if (retry) {
                                retry--;
--

2.19.2

#4 lore raw
Quoted 7 lines · Gustavo A. R. Silva

Mathieu,

Quoted 2 lines · Mathieu Malaterre

ping ?

Quoted 6 lines

I have sent the following patch to address all these warnings in firewire:

https://lore.kernel.org/patchwork/patch/1040737/

and, as this is being ignored, I'll add it to my tree for 5.2.

Good ! I was only starring at -next

Thanks

Quoted 37 lines

Thanks
--
Gustavo

Quoted 33 lines · Mathieu Malaterre
Quoted 32 lines

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

In this particular case rewrote the comment to start with the string "fall through", so as to match the regular expression expected by GCC.

This commit remove the following warning:

drivers/firewire/core-iso.c:308:7: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/firewire/core-iso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firewire/core-iso.c +1 -2
index 35e784cffc23..d2d50bda5a5f 100644
@@ -308,7 +308,7 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,
                        if ((data[0] & bit) == (data[1] & bit))
                                continue;
 
-                       /* 1394-1995 IRM, fall through to retry. */
+                       /* fall through - 1394-1995 IRM to retry. */
                default:
                        if (retry) {
                                retry--;
--

2.19.2