2019-01-14 20:45:30

by Mathieu Malaterre

[permalink] [raw]
Subject: [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=]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
drivers/firewire/core-iso.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c
index 35e784cffc23..d2d50bda5a5f 100644
--- a/drivers/firewire/core-iso.c
+++ b/drivers/firewire/core-iso.c
@@ -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



2019-01-14 20:44:32

by Mathieu Malaterre

[permalink] [raw]
Subject: [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)) {

Signed-off-by: Mathieu Malaterre <[email protected]>
---
drivers/firewire/core-device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 7c2eed76011e..e41d55b04940 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -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;
}
--
2.19.2


2019-03-13 20:29:00

by Mathieu Malaterre

[permalink] [raw]
Subject: Re: [PATCH 1/2] firewire: annotate implicit fall through

ping ?

On Mon, Jan 14, 2019 at 9:42 PM Mathieu Malaterre <[email protected]> wrote:
>
> 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=]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>
> ---
> drivers/firewire/core-iso.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c
> index 35e784cffc23..d2d50bda5a5f 100644
> --- a/drivers/firewire/core-iso.c
> +++ b/drivers/firewire/core-iso.c
> @@ -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
>

2019-03-13 20:39:57

by Gustavo A. R. Silva

[permalink] [raw]
Subject: Re: [PATCH 1/2] firewire: annotate implicit fall through

Mathieu,

On 3/13/19 3:28 PM, Mathieu Malaterre wrote:
> 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

> On Mon, Jan 14, 2019 at 9:42 PM Mathieu Malaterre <[email protected]> wrote:
>>
>> 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=]
>>
>> Signed-off-by: Mathieu Malaterre <[email protected]>
>> ---
>> drivers/firewire/core-iso.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c
>> index 35e784cffc23..d2d50bda5a5f 100644
>> --- a/drivers/firewire/core-iso.c
>> +++ b/drivers/firewire/core-iso.c
>> @@ -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
>>

2019-03-13 20:52:23

by Mathieu Malaterre

[permalink] [raw]
Subject: Re: [PATCH 1/2] firewire: annotate implicit fall through

On Wed, Mar 13, 2019 at 9:39 PM Gustavo A. R. Silva
<[email protected]> wrote:
>
> Mathieu,
>
> On 3/13/19 3:28 PM, Mathieu Malaterre wrote:
> > 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.

Good ! I was only starring at -next

Thanks

> Thanks
> --
> Gustavo
>
> > On Mon, Jan 14, 2019 at 9:42 PM Mathieu Malaterre <[email protected]> wrote:
> >>
> >> 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=]
> >>
> >> Signed-off-by: Mathieu Malaterre <[email protected]>
> >> ---
> >> drivers/firewire/core-iso.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c
> >> index 35e784cffc23..d2d50bda5a5f 100644
> >> --- a/drivers/firewire/core-iso.c
> >> +++ b/drivers/firewire/core-iso.c
> >> @@ -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
> >>