2019-07-29 00:02:20

by Gustavo A. R. Silva

Subject: [PATCH] mmc: atmel-mci: Mark expected switch fall-throughs

Mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/mmc/host/atmel-mci.c: In function 'atmci_get_cap':
drivers/mmc/host/atmel-mci.c:2415:30: warning: this statement may fall through [-Wimplicit-fallthrough=]
host->caps.has_odd_clk_div = 1;
~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/mmc/host/atmel-mci.c:2416:2: note: here
case 0x400:
^~~~
drivers/mmc/host/atmel-mci.c:2422:28: warning: this statement may fall through [-Wimplicit-fallthrough=]
host->caps.has_highspeed = 1;
~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/mmc/host/atmel-mci.c:2423:2: note: here
case 0x200:
^~~~
drivers/mmc/host/atmel-mci.c:2426:40: warning: this statement may fall through [-Wimplicit-fallthrough=]
host->caps.need_notbusy_for_read_ops = 1;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/mmc/host/atmel-mci.c:2427:2: note: here
case 0x100:
^~~~

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/mmc/host/atmel-mci.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 9ee0bc0ce6d0..c26fbe5f2222 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2413,6 +2413,7 @@ static void atmci_get_cap(struct atmel_mci *host)
case 0x600:
case 0x500:
host->caps.has_odd_clk_div = 1;
+ /* Fall through */
case 0x400:
case 0x300:
host->caps.has_dma_conf_reg = 1;
@@ -2420,13 +2421,16 @@ static void atmci_get_cap(struct atmel_mci *host)
host->caps.has_cfg_reg = 1;
host->caps.has_cstor_reg = 1;
host->caps.has_highspeed = 1;
+ /* Fall through */
case 0x200:
host->caps.has_rwproof = 1;
host->caps.need_blksz_mul_4 = 0;
host->caps.need_notbusy_for_read_ops = 1;
+ /* Fall through */
case 0x100:
host->caps.has_bad_data_ordering = 0;
host->caps.need_reset_after_xfer = 0;
+ /* Fall through */
case 0x0:
break;
default:
--
2.22.0

2019-07-29 19:26:08

by Kees Cook

Subject: Re: [PATCH] mmc: atmel-mci: Mark expected switch fall-throughs

On Sun, Jul 28, 2019 at 07:01:23PM -0500, Gustavo A. R. Silva wrote:
> Mark switch cases where we are expecting to fall through.
>
> This patch fixes the following warnings:
>
> drivers/mmc/host/atmel-mci.c: In function 'atmci_get_cap':
> drivers/mmc/host/atmel-mci.c:2415:30: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.has_odd_clk_div = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2416:2: note: here
> case 0x400:
> ^~~~
> drivers/mmc/host/atmel-mci.c:2422:28: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.has_highspeed = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2423:2: note: here
> case 0x200:
> ^~~~
> drivers/mmc/host/atmel-mci.c:2426:40: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.need_notbusy_for_read_ops = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2427:2: note: here
> case 0x100:
> ^~~~
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Reviewed-by: Kees Cook <[email protected]>

-Kees

> ---
> drivers/mmc/host/atmel-mci.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 9ee0bc0ce6d0..c26fbe5f2222 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2413,6 +2413,7 @@ static void atmci_get_cap(struct atmel_mci *host)
> case 0x600:
> case 0x500:
> host->caps.has_odd_clk_div = 1;
> + /* Fall through */
> case 0x400:
> case 0x300:
> host->caps.has_dma_conf_reg = 1;
> @@ -2420,13 +2421,16 @@ static void atmci_get_cap(struct atmel_mci *host)
> host->caps.has_cfg_reg = 1;
> host->caps.has_cstor_reg = 1;
> host->caps.has_highspeed = 1;
> + /* Fall through */
> case 0x200:
> host->caps.has_rwproof = 1;
> host->caps.need_blksz_mul_4 = 0;
> host->caps.need_notbusy_for_read_ops = 1;
> + /* Fall through */
> case 0x100:
> host->caps.has_bad_data_ordering = 0;
> host->caps.need_reset_after_xfer = 0;
> + /* Fall through */
> case 0x0:
> break;
> default:
> --
> 2.22.0
>

--
Kees Cook

2019-07-31 11:36:11

by Ludovic Desroches

Subject: Re: [PATCH] mmc: atmel-mci: Mark expected switch fall-throughs

Hi,

On Sun, Jul 28, 2019 at 07:01:23PM -0500, Gustavo A. R. Silva wrote:
>
> Mark switch cases where we are expecting to fall through.
>
> This patch fixes the following warnings:
>
> drivers/mmc/host/atmel-mci.c: In function 'atmci_get_cap':
> drivers/mmc/host/atmel-mci.c:2415:30: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.has_odd_clk_div = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2416:2: note: here
> case 0x400:
> ^~~~
> drivers/mmc/host/atmel-mci.c:2422:28: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.has_highspeed = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2423:2: note: here
> case 0x200:
> ^~~~
> drivers/mmc/host/atmel-mci.c:2426:40: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.need_notbusy_for_read_ops = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2427:2: note: here
> case 0x100:
> ^~~~
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

I don't know if there is a policy in the kernel about the expression to
use. As this one does the job
Acked-by: Ludovic Desroches <[email protected]>

Thanks

> ---
> drivers/mmc/host/atmel-mci.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 9ee0bc0ce6d0..c26fbe5f2222 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2413,6 +2413,7 @@ static void atmci_get_cap(struct atmel_mci *host)
> case 0x600:
> case 0x500:
> host->caps.has_odd_clk_div = 1;
> + /* Fall through */
> case 0x400:
> case 0x300:
> host->caps.has_dma_conf_reg = 1;
> @@ -2420,13 +2421,16 @@ static void atmci_get_cap(struct atmel_mci *host)
> host->caps.has_cfg_reg = 1;
> host->caps.has_cstor_reg = 1;
> host->caps.has_highspeed = 1;
> + /* Fall through */
> case 0x200:
> host->caps.has_rwproof = 1;
> host->caps.need_blksz_mul_4 = 0;
> host->caps.need_notbusy_for_read_ops = 1;
> + /* Fall through */
> case 0x100:
> host->caps.has_bad_data_ordering = 0;
> host->caps.need_reset_after_xfer = 0;
> + /* Fall through */
> case 0x0:
> break;
> default:
> --
> 2.22.0
>
>

2019-07-31 16:08:09

by Kees Cook

Subject: Re: [PATCH] mmc: atmel-mci: Mark expected switch fall-throughs

On Wed, Jul 31, 2019 at 01:32:16PM +0200, Ludovic Desroches wrote:
> > drivers/mmc/host/atmel-mci.c:2426:40: warning: this statement may fall through [-Wimplicit-fallthrough=]
> > host->caps.need_notbusy_for_read_ops = 1;
> > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> > drivers/mmc/host/atmel-mci.c:2427:2: note: here
> > case 0x100:
> > ^~~~
> >
> > Reported-by: Stephen Rothwell <[email protected]>
> > Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> I don't know if there is a policy in the kernel about the expression to
> use. As this one does the job

Yup, documented here:
https://www.kernel.org/doc/html/latest/process/deprecated.html#implicit-switch-case-fall-through

> Acked-by: Ludovic Desroches <[email protected]>

Thanks!

--
Kees Cook

2019-08-01 08:20:48

by Ludovic Desroches

Subject: Re: [PATCH] mmc: atmel-mci: Mark expected switch fall-throughs

On Wed, Jul 31, 2019 at 09:06:07AM -0700, Kees Cook wrote:
> On Wed, Jul 31, 2019 at 01:32:16PM +0200, Ludovic Desroches wrote:
> > > drivers/mmc/host/atmel-mci.c:2426:40: warning: this statement may fall through [-Wimplicit-fallthrough=]
> > > host->caps.need_notbusy_for_read_ops = 1;
> > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> > > drivers/mmc/host/atmel-mci.c:2427:2: note: here
> > > case 0x100:
> > > ^~~~
> > >
> > > Reported-by: Stephen Rothwell <[email protected]>
> > > Signed-off-by: Gustavo A. R. Silva <[email protected]>
> >
> > I don't know if there is a policy in the kernel about the expression to
> > use. As this one does the job
>
> Yup, documented here:
> https://www.kernel.org/doc/html/latest/process/deprecated.html#implicit-switch-case-fall-through

Thanks for the pointer.

Regards

Ludovic

>
> > Acked-by: Ludovic Desroches <[email protected]>
>
> Thanks!
>
> --
> Kees Cook

2019-08-03 20:01:07

by Ulf Hansson

Subject: Re: [PATCH] mmc: atmel-mci: Mark expected switch fall-throughs

On Mon, 29 Jul 2019 at 02:01, Gustavo A. R. Silva
<[email protected]> wrote:
>
> Mark switch cases where we are expecting to fall through.
>
> This patch fixes the following warnings:
>
> drivers/mmc/host/atmel-mci.c: In function 'atmci_get_cap':
> drivers/mmc/host/atmel-mci.c:2415:30: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.has_odd_clk_div = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2416:2: note: here
> case 0x400:
> ^~~~
> drivers/mmc/host/atmel-mci.c:2422:28: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.has_highspeed = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2423:2: note: here
> case 0x200:
> ^~~~
> drivers/mmc/host/atmel-mci.c:2426:40: warning: this statement may fall through [-Wimplicit-fallthrough=]
> host->caps.need_notbusy_for_read_ops = 1;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/mmc/host/atmel-mci.c:2427:2: note: here
> case 0x100:
> ^~~~
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Applied for next, thanks!

Kind regards
Uffe


> ---
> drivers/mmc/host/atmel-mci.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 9ee0bc0ce6d0..c26fbe5f2222 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2413,6 +2413,7 @@ static void atmci_get_cap(struct atmel_mci *host)
> case 0x600:
> case 0x500:
> host->caps.has_odd_clk_div = 1;
> + /* Fall through */
> case 0x400:
> case 0x300:
> host->caps.has_dma_conf_reg = 1;
> @@ -2420,13 +2421,16 @@ static void atmci_get_cap(struct atmel_mci *host)
> host->caps.has_cfg_reg = 1;
> host->caps.has_cstor_reg = 1;
> host->caps.has_highspeed = 1;
> + /* Fall through */
> case 0x200:
> host->caps.has_rwproof = 1;
> host->caps.need_blksz_mul_4 = 0;
> host->caps.need_notbusy_for_read_ops = 1;
> + /* Fall through */
> case 0x100:
> host->caps.has_bad_data_ordering = 0;
> host->caps.need_reset_after_xfer = 0;
> + /* Fall through */
> case 0x0:
> break;
> default:
> --
> 2.22.0
>