[PATCH-for-4.1?,2/7] hw/dma/omap_dma: Move switch 'fall through' comment to correct place
diff mbox series

Message ID 20190719131425.10835-3-philmd@redhat.com
State New
Headers show
Series
  • Trivial switch 'fall through' comment fixes for GCC9
Related show

Commit Message

Philippe Mathieu-Daudé July 19, 2019, 1:14 p.m. UTC
Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2:

    CC      hw/dma/omap_dma.o
  hw/dma/omap_dma.c: In function ‘omap_dma_write’:
  hw/dma/omap_dma.c:1532:12: error: this statement may fall through [-Werror=implicit-fallthrough=]
   1532 |         if (s->model <= omap_dma_3_1)
        |            ^
  hw/dma/omap_dma.c:1534:5: note: here
   1534 |     case 0x400:
        |     ^~~~
  cc1: all warnings being treated as errors

Correctly place the 'fall through' comment.

Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/dma/omap_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Maydell July 19, 2019, 1:27 p.m. UTC | #1
On Fri, 19 Jul 2019 at 14:14, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2:
>
>     CC      hw/dma/omap_dma.o
>   hw/dma/omap_dma.c: In function ‘omap_dma_write’:
>   hw/dma/omap_dma.c:1532:12: error: this statement may fall through [-Werror=implicit-fallthrough=]
>    1532 |         if (s->model <= omap_dma_3_1)
>         |            ^
>   hw/dma/omap_dma.c:1534:5: note: here
>    1534 |     case 0x400:
>         |     ^~~~
>   cc1: all warnings being treated as errors
>
> Correctly place the 'fall through' comment.
>
> Reported-by: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  hw/dma/omap_dma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
> index eab83c5c3a..6677237d42 100644
> --- a/hw/dma/omap_dma.c
> +++ b/hw/dma/omap_dma.c
> @@ -1531,8 +1531,8 @@ static void omap_dma_write(void *opaque, hwaddr addr,
>      case 0x404 ... 0x4fe:
>          if (s->model <= omap_dma_3_1)
>              break;
> +        /* fall through */
>      case 0x400:
> -        /* Fall through. */
>          if (omap_dma_sys_write(s, addr, value))
>              break;
>          return;
> -

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
Laurent Vivier Aug. 21, 2019, 8:55 a.m. UTC | #2
Le 19/07/2019 à 15:14, Philippe Mathieu-Daudé a écrit :
> Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2:
> 
>     CC      hw/dma/omap_dma.o
>   hw/dma/omap_dma.c: In function ‘omap_dma_write’:
>   hw/dma/omap_dma.c:1532:12: error: this statement may fall through [-Werror=implicit-fallthrough=]
>    1532 |         if (s->model <= omap_dma_3_1)
>         |            ^
>   hw/dma/omap_dma.c:1534:5: note: here
>    1534 |     case 0x400:
>         |     ^~~~
>   cc1: all warnings being treated as errors
> 
> Correctly place the 'fall through' comment.
> 
> Reported-by: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  hw/dma/omap_dma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
> index eab83c5c3a..6677237d42 100644
> --- a/hw/dma/omap_dma.c
> +++ b/hw/dma/omap_dma.c
> @@ -1531,8 +1531,8 @@ static void omap_dma_write(void *opaque, hwaddr addr,
>      case 0x404 ... 0x4fe:
>          if (s->model <= omap_dma_3_1)
>              break;
> +        /* fall through */
>      case 0x400:
> -        /* Fall through. */
>          if (omap_dma_sys_write(s, addr, value))
>              break;
>          return;
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Patch
diff mbox series

diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index eab83c5c3a..6677237d42 100644
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -1531,8 +1531,8 @@  static void omap_dma_write(void *opaque, hwaddr addr,
     case 0x404 ... 0x4fe:
         if (s->model <= omap_dma_3_1)
             break;
+        /* fall through */
     case 0x400:
-        /* Fall through. */
         if (omap_dma_sys_write(s, addr, value))
             break;
         return;