[PATCH] hw/net/can: Add missing fallthrough statements

Thomas Huth posted 1 patch 1 week ago
Test FreeBSD passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test docker-mingw@fedora passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200630075520.29825-1-thuth@redhat.com
Maintainers: Jason Wang <jasowang@redhat.com>
hw/net/can/can_sja1000.c | 2 ++
1 file changed, 2 insertions(+)

[PATCH] hw/net/can: Add missing fallthrough statements

Posted by Thomas Huth 1 week ago
Add fallthrough annotations to be able to compile the code without
warnings when using -Wimplicit-fallthrough in our CFLAGS. Looking
at the code, it seems like the fallthrough is indeed intended here,
so the comments should be appropriate.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/net/can/can_sja1000.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index ea915a023a..299932998a 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -523,6 +523,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
             break;
         case 16: /* RX frame information addr16-28. */
             s->status_pel |= (1 << 5); /* Set transmit status. */
+            /* fallthrough */
         case 17 ... 28:
             if (s->mode & 0x01) { /* Reset mode */
                 if (addr < 24) {
@@ -620,6 +621,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
             break;
         case 10:
             s->status_bas |= (1 << 5); /* Set transmit status. */
+            /* fallthrough */
         case 11 ... 19:
             if ((s->control & 0x01) == 0) { /* Operation mode */
                 s->tx_buff[addr - 10] = val; /* Store to TX buffer directly. */
-- 
2.18.1


Re: [PATCH] hw/net/can: Add missing fallthrough statements

Posted by Laurent Vivier 4 days ago
Le 30/06/2020 à 09:55, Thomas Huth a écrit :
> Add fallthrough annotations to be able to compile the code without
> warnings when using -Wimplicit-fallthrough in our CFLAGS. Looking
> at the code, it seems like the fallthrough is indeed intended here,
> so the comments should be appropriate.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/net/can/can_sja1000.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index ea915a023a..299932998a 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -523,6 +523,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
>              break;
>          case 16: /* RX frame information addr16-28. */
>              s->status_pel |= (1 << 5); /* Set transmit status. */
> +            /* fallthrough */
>          case 17 ... 28:
>              if (s->mode & 0x01) { /* Reset mode */
>                  if (addr < 24) {
> @@ -620,6 +621,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
>              break;
>          case 10:
>              s->status_bas |= (1 << 5); /* Set transmit status. */
> +            /* fallthrough */
>          case 11 ... 19:
>              if ((s->control & 0x01) == 0) { /* Operation mode */
>                  s->tx_buff[addr - 10] = val; /* Store to TX buffer directly. */
> 

cc: Pavel Pisa <pisa@cmp.felk.cvut.cz>

Reviewed-by: Laurent Vivier <laurent@vivier.eu>