Skip to contentSkip to conversation

watchdog: alim7101: Mark expected switch fall-through

PATCH In review Gustavo A. R. Silva 2 participants 6 messages Mar 20, 2019 – Apr 5, 2019 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog: alim7101: Mark expected switch fall-through

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
wdt_keepalive();
^~~~~~~~~~~~~~~
drivers/watchdog/alim7101_wdt.c:282:2: note: here
case WDIOC_GETTIMEOUT:
^~~~

Notice that, in this particular case, the /* Fall through */ comment is placed at the very bottom of the case statement, which is what GCC is expecting to find.

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

---
 drivers/watchdog/alim7101_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/alim7101_wdt.c +1 -1
index 12f7ea62dddd..f5ada07e9202 100644
@@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			return -EINVAL;
 		timeout = new_timeout;
 		wdt_keepalive();
-		/* Fall through */
 	}
+		/* Fall through */
 	case WDIOC_GETTIMEOUT:
 		return put_user(timeout, p);
 	default:
Signature · 1 line
2.21.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

    wdt_keepalive();
    ^~~~~~~~~~~~~~~
drivers/watchdog/alim7101_wdt.c:282:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Notice that, in this particular case, the /* Fall through */ comment is placed at the very bottom of the case statement, which is what GCC is expecting to find.

Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

Quoted 19 lines
---
  drivers/watchdog/alim7101_wdt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/alim7101_wdt.c +1 -1
index 12f7ea62dddd..f5ada07e9202 100644
@@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  			return -EINVAL;
  		timeout = new_timeout;
  		wdt_keepalive();
-		/* Fall through */
  	}
+		/* Fall through */
  	case WDIOC_GETTIMEOUT:
  		return put_user(timeout, p);
  	default:
#2 lore raw
Quoted 18 lines · Guenter Roeck
Quoted 17 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=] wdt_keepalive();
    ^~~~~~~~~~~~~~~
drivers/watchdog/alim7101_wdt.c:282:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Notice that, in this particular case, the /* Fall through */ comment is placed at the very bottom of the case statement, which is what GCC is expecting to find.

Quoted 9 lines
Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

Thanks, Guenter. :)

--
Gustavo

Quoted 20 lines
Quoted 19 lines

---
  drivers/watchdog/alim7101_wdt.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/alim7101_wdt.c +1 -1
index 12f7ea62dddd..f5ada07e9202 100644
@@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
               return -EINVAL;
           timeout = new_timeout;
           wdt_keepalive();
-        /* Fall through */
       }
+        /* Fall through */

      case WDIOC_GETTIMEOUT:
          return put_user(timeout, p);
      default:

#3 lore raw

Hi all,

Friendly ping:

Who can take this?

Thanks
--
Gustavo

Quoted 56 lines · Gustavo A. R. Silva
Quoted 18 lines · Guenter Roeck
Quoted 17 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=] wdt_keepalive();
    ^~~~~~~~~~~~~~~
drivers/watchdog/alim7101_wdt.c:282:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Notice that, in this particular case, the /* Fall through */ comment is placed at the very bottom of the case statement, which is what GCC is expecting to find.

Quoted 9 lines
Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

Thanks, Guenter. :)

--
Gustavo

Quoted 20 lines
Quoted 19 lines

---
  drivers/watchdog/alim7101_wdt.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/alim7101_wdt.c +1 -1
index 12f7ea62dddd..f5ada07e9202 100644
@@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
               return -EINVAL;
           timeout = new_timeout;
           wdt_keepalive();
-        /* Fall through */
       }
+        /* Fall through */

      case WDIOC_GETTIMEOUT:
          return put_user(timeout, p);
      default:

maintainer
#4 lore raw
Quoted 5 lines · Gustavo A. R. Silva

Hi all,

Friendly ping:

Who can take this?

I added it to my watchdog-next branch. Usually Wim will pick it up from there.

Guenter

Quoted 62 lines

Thanks
--
Gustavo

Quoted 56 lines · Gustavo A. R. Silva
Quoted 18 lines · Guenter Roeck
Quoted 17 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=] wdt_keepalive();
    ^~~~~~~~~~~~~~~
drivers/watchdog/alim7101_wdt.c:282:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Notice that, in this particular case, the /* Fall through */ comment is placed at the very bottom of the case statement, which is what GCC is expecting to find.

Quoted 9 lines
Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enabling -Wimplicit-fallthrough.

Thanks, Guenter. :)

--
Gustavo

Quoted 20 lines
Quoted 19 lines

---
  drivers/watchdog/alim7101_wdt.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/alim7101_wdt.c +1 -1
index 12f7ea62dddd..f5ada07e9202 100644
@@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
               return -EINVAL;
           timeout = new_timeout;
           wdt_keepalive();
-        /* Fall through */
       }
+        /* Fall through */

      case WDIOC_GETTIMEOUT:
          return put_user(timeout, p);
      default:

#5 lore raw
Quoted 9 lines · Guenter Roeck
Quoted 5 lines · Gustavo A. R. Silva

Hi all,

Friendly ping:

Who can take this?

I added it to my watchdog-next branch. Usually Wim will pick it up from there.

Awesome. :)

Thanks, Guenter.
--
Gustavo