diff mbox

pflash_cfi01: Fix warning caused by unreachable code

Message ID 1346497248-14659-1-git-send-email-sw@weilnetz.de
State Accepted
Headers show

Commit Message

Stefan Weil Sept. 1, 2012, 11 a.m. UTC
Report from smatch:
hw/pflash_cfi01.c:431 pflash_write(180) info: ignoring unreachable code.

Instead of removing the return statement after the switch statement,
the patch replaces the return statements in the switch statement by
break statements. Other switch statements in the same code do it also
like that.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/pflash_cfi01.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Stefan Weil Sept. 20, 2012, 4:57 p.m. UTC | #1
Am 01.09.2012 13:00, schrieb Stefan Weil:
> Report from smatch:
> hw/pflash_cfi01.c:431 pflash_write(180) info: ignoring unreachable code.
>
> Instead of removing the return statement after the switch statement,
> the patch replaces the return statements in the switch statement by
> break statements. Other switch statements in the same code do it also
> like that.
>
> Signed-off-by: Stefan Weil<sw@weilnetz.de>
> ---
>   hw/pflash_cfi01.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
> index d1c7423..56ed33f 100644
> --- a/hw/pflash_cfi01.c
> +++ b/hw/pflash_cfi01.c
> @@ -320,7 +320,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
>           }
>           pfl->wcycle++;
>           pfl->cmd = cmd;
> -        return;
> +        break;
>       case 1:
>           switch (pfl->cmd) {
>           case 0x10: /* Single Byte Program */
> @@ -375,7 +375,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
>           default:
>               goto error_flash;
>           }
> -        return;
> +        break;
>       case 2:
>           switch (pfl->cmd) {
>           case 0xe8: /* Block write */
> @@ -406,7 +406,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
>           default:
>               goto error_flash;
>           }
> -        return;
> +        break;
>       case 3: /* Confirm mode */
>           switch (pfl->cmd) {
>           case 0xe8: /* Block write */
> @@ -422,7 +422,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
>           default:
>               goto error_flash;
>           }
> -        return;
> +        break;
>       default:
>           /* Should never happen */
>           DPRINTF("%s: invalid write state\n",  __func__);
>    

Ping?
Stefan Hajnoczi Sept. 22, 2012, 3:44 p.m. UTC | #2
On Sat, Sep 01, 2012 at 01:00:48PM +0200, Stefan Weil wrote:
> Report from smatch:
> hw/pflash_cfi01.c:431 pflash_write(180) info: ignoring unreachable code.
> 
> Instead of removing the return statement after the switch statement,
> the patch replaces the return statements in the switch statement by
> break statements. Other switch statements in the same code do it also
> like that.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  hw/pflash_cfi01.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan
diff mbox

Patch

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index d1c7423..56ed33f 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -320,7 +320,7 @@  static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
         }
         pfl->wcycle++;
         pfl->cmd = cmd;
-        return;
+        break;
     case 1:
         switch (pfl->cmd) {
         case 0x10: /* Single Byte Program */
@@ -375,7 +375,7 @@  static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
         default:
             goto error_flash;
         }
-        return;
+        break;
     case 2:
         switch (pfl->cmd) {
         case 0xe8: /* Block write */
@@ -406,7 +406,7 @@  static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
         default:
             goto error_flash;
         }
-        return;
+        break;
     case 3: /* Confirm mode */
         switch (pfl->cmd) {
         case 0xe8: /* Block write */
@@ -422,7 +422,7 @@  static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
         default:
             goto error_flash;
         }
-        return;
+        break;
     default:
         /* Should never happen */
         DPRINTF("%s: invalid write state\n",  __func__);