diff mbox series

iio: mma8452: mark expected switch fall-through

Message ID 20190211222318.GA21656@embeddedor (mailing list archive)
State New, archived
Headers show
Series iio: mma8452: mark expected switch fall-through | expand

Commit Message

Gustavo A. R. Silva Feb. 11, 2019, 10:23 p.m. UTC
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/iio/accel/mma8452.c: In function ‘mma8452_probe’:
drivers/iio/accel/mma8452.c:1581:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (ret == data->chip_info->chip_id)
      ^
drivers/iio/accel/mma8452.c:1584:2: note: here
  default:
  ^~~~~~~

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.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/iio/accel/mma8452.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jonathan Cameron Feb. 20, 2019, 12:17 p.m. UTC | #1
On Mon, 11 Feb 2019 16:23:18 -0600
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:

> In preparation to enabling -Wimplicit-fallthrough, mark switch
> cases where we are expecting to fall through.
> 
> This patch fixes the following warning:
> 
> drivers/iio/accel/mma8452.c: In function ‘mma8452_probe’:
> drivers/iio/accel/mma8452.c:1581:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>    if (ret == data->chip_info->chip_id)
>       ^
> drivers/iio/accel/mma8452.c:1584:2: note: here
>   default:
>   ^~~~~~~
> 
> 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.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
I know Peter probably won't like this, as it doesn't
read a as well, with the else dropped, but I'm going to take
it as we have had a lot of bugs caught by this code and this
is generating a false positive.

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

> ---
>  drivers/iio/accel/mma8452.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
> index 302781126bc6..00e100fc845a 100644
> --- a/drivers/iio/accel/mma8452.c
> +++ b/drivers/iio/accel/mma8452.c
> @@ -1580,7 +1580,7 @@ static int mma8452_probe(struct i2c_client *client,
>  	case FXLS8471_DEVICE_ID:
>  		if (ret == data->chip_info->chip_id)
>  			break;
> -		/* else: fall through */
> +		/* fall through */
>  	default:
>  		ret = -ENODEV;
>  		goto disable_regulators;
Gustavo A. R. Silva Feb. 20, 2019, 5:21 p.m. UTC | #2
On 2/20/19 6:17 AM, Jonathan Cameron wrote:
> On Mon, 11 Feb 2019 16:23:18 -0600
> "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> 
>> In preparation to enabling -Wimplicit-fallthrough, mark switch
>> cases where we are expecting to fall through.
>>
>> This patch fixes the following warning:
>>
>> drivers/iio/accel/mma8452.c: In function ‘mma8452_probe’:
>> drivers/iio/accel/mma8452.c:1581:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>    if (ret == data->chip_info->chip_id)
>>       ^
>> drivers/iio/accel/mma8452.c:1584:2: note: here
>>   default:
>>   ^~~~~~~
>>
>> 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.
>>
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> I know Peter probably won't like this, as it doesn't
> read a as well, with the else dropped, but I'm going to take
> it as we have had a lot of bugs caught by this code and this
> is generating a false positive.
> 
> Applied to the togreg branch of iio.git and pushed out as testing
> for the autobuilders to play with it.
> 

Thanks, Jonathan.

--
Gustavo
Gustavo A. R. Silva Feb. 20, 2019, 6:07 p.m. UTC | #3
On 2/20/19 11:21 AM, Gustavo A. R. Silva wrote:
> 
> 
> On 2/20/19 6:17 AM, Jonathan Cameron wrote:
>> On Mon, 11 Feb 2019 16:23:18 -0600
>> "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
>>
>>> In preparation to enabling -Wimplicit-fallthrough, mark switch
>>> cases where we are expecting to fall through.
>>>
>>> This patch fixes the following warning:
>>>
>>> drivers/iio/accel/mma8452.c: In function ‘mma8452_probe’:
>>> drivers/iio/accel/mma8452.c:1581:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>>    if (ret == data->chip_info->chip_id)
>>>       ^
>>> drivers/iio/accel/mma8452.c:1584:2: note: here
>>>   default:
>>>   ^~~~~~~
>>>
>>> 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.
>>>
>>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>> I know Peter probably won't like this, as it doesn't
>> read a as well, with the else dropped, but I'm going to take
>> it as we have had a lot of bugs caught by this code and this
>> is generating a false positive.
>>
>> Applied to the togreg branch of iio.git and pushed out as testing
>> for the autobuilders to play with it.
>>
> 
> Thanks, Jonathan.
> 

BTW, Jonathan, I wonder if you can apply this one too:

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

Thanks
--
Gustavo
Jonathan Cameron March 3, 2019, 5:04 p.m. UTC | #4
On Wed, 20 Feb 2019 12:07:28 -0600
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:

> On 2/20/19 11:21 AM, Gustavo A. R. Silva wrote:
> > 
> > 
> > On 2/20/19 6:17 AM, Jonathan Cameron wrote:  
> >> On Mon, 11 Feb 2019 16:23:18 -0600
> >> "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> >>  
> >>> In preparation to enabling -Wimplicit-fallthrough, mark switch
> >>> cases where we are expecting to fall through.
> >>>
> >>> This patch fixes the following warning:
> >>>
> >>> drivers/iio/accel/mma8452.c: In function ‘mma8452_probe’:
> >>> drivers/iio/accel/mma8452.c:1581:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> >>>    if (ret == data->chip_info->chip_id)
> >>>       ^
> >>> drivers/iio/accel/mma8452.c:1584:2: note: here
> >>>   default:
> >>>   ^~~~~~~
> >>>
> >>> 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.
> >>>
> >>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>  
> >> I know Peter probably won't like this, as it doesn't
> >> read a as well, with the else dropped, but I'm going to take
> >> it as we have had a lot of bugs caught by this code and this
> >> is generating a false positive.
> >>
> >> Applied to the togreg branch of iio.git and pushed out as testing
> >> for the autobuilders to play with it.
> >>  
> > 
> > Thanks, Jonathan.
> >   
> 
> BTW, Jonathan, I wonder if you can apply this one too:
> 
> https://lore.kernel.org/patchwork/patch/996804/
> 
> Thanks
Now resolved.  The issue here was the code was 'interesting/crazy' so
we needed someone with hardware to rewrite it and test the result.

Simply fixing the fall through wasn't enough :(

Jonathan

> --
> Gustavo
Gustavo A. R. Silva March 3, 2019, 5:35 p.m. UTC | #5
On 3/3/19 11:04 AM, Jonathan Cameron wrote:

>>
>> BTW, Jonathan, I wonder if you can apply this one too:
>>
>> https://lore.kernel.org/patchwork/patch/996804/
>>
>> Thanks
> Now resolved.  The issue here was the code was 'interesting/crazy' so
> we needed someone with hardware to rewrite it and test the result.
> 

Yep.

> Simply fixing the fall through wasn't enough :(
> 

I'm happy this was finally resolved. :)

Thanks, Jonathan.

--
Gustavo
diff mbox series

Patch

diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 302781126bc6..00e100fc845a 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -1580,7 +1580,7 @@  static int mma8452_probe(struct i2c_client *client,
 	case FXLS8471_DEVICE_ID:
 		if (ret == data->chip_info->chip_id)
 			break;
-		/* else: fall through */
+		/* fall through */
 	default:
 		ret = -ENODEV;
 		goto disable_regulators;