2019-01-14 20:47:21

by Mathieu Malaterre

Subject: [PATCH] nvram: 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).

This commit remove the following warning:

drivers/char/generic_nvram.c:83:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
drivers/char/generic_nvram.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
index ff5394f47587..53123c110f7b 100644
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
@@ -81,6 +81,7 @@ static int nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
#ifdef CONFIG_PPC_PMAC
case OBSOLETE_PMAC_NVRAM_GET_OFFSET:
printk(KERN_WARNING "nvram: Using obsolete PMAC_NVRAM_GET_OFFSET ioctl\n");
+ /* fall through */
case IOC_NVRAM_GET_OFFSET: {
int part, offset;

--
2.19.2

2019-01-14 21:42:05

by Gustavo A. R. Silva

Subject: Re: [PATCH] nvram: annotate implicit fall through

On 1/14/19 2:44 PM, Mathieu Malaterre wrote:
> There is a plan to build the kernel with -Wimplicit-fallthrough and
> this place in the code produced a warning (W=1).
>
> This commit remove the following warning:
>
> drivers/char/generic_nvram.c:83:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>
> ---
> drivers/char/generic_nvram.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
> index ff5394f47587..53123c110f7b 100644
> --- a/drivers/char/generic_nvram.c
> +++ b/drivers/char/generic_nvram.c
> @@ -81,6 +81,7 @@ static int nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> #ifdef CONFIG_PPC_PMAC
> case OBSOLETE_PMAC_NVRAM_GET_OFFSET:
> printk(KERN_WARNING "nvram: Using obsolete PMAC_NVRAM_GET_OFFSET ioctl\n");

Here you could use the pr_warn() macro instead of the obsolete printk KERN_WARNING, but that'd
be another patch.

Anyway:

Acked-by: Gustavo A. R. Silva <[email protected]>

Thanks
--
Gustavo

> + /* fall through */
> case IOC_NVRAM_GET_OFFSET: {
> int part, offset;
>
>

2019-01-22 09:25:32

by Greg Kroah-Hartman

Subject: Re: [PATCH] nvram: annotate implicit fall through

On Mon, Jan 14, 2019 at 09:44:15PM +0100, Mathieu Malaterre wrote:
> There is a plan to build the kernel with -Wimplicit-fallthrough and
> this place in the code produced a warning (W=1).
>
> This commit remove the following warning:
>
> drivers/char/generic_nvram.c:83:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>
> Acked-by: Gustavo A. R. Silva <[email protected]>
> ---
> drivers/char/generic_nvram.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
> index ff5394f47587..53123c110f7b 100644
> --- a/drivers/char/generic_nvram.c
> +++ b/drivers/char/generic_nvram.c
> @@ -81,6 +81,7 @@ static int nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> #ifdef CONFIG_PPC_PMAC
> case OBSOLETE_PMAC_NVRAM_GET_OFFSET:
> printk(KERN_WARNING "nvram: Using obsolete PMAC_NVRAM_GET_OFFSET ioctl\n");
> + /* fall through */
> case IOC_NVRAM_GET_OFFSET: {
> int part, offset;
>

This file is now gone from my tree, sorry.

greg k-h