qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Stephen Checkoway <stephen.checkoway@oberlin.edu>
Cc: "Markus Armbruster" <armbru@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through
Date: Mon,  6 May 2019 00:15:38 +0200	[thread overview]
Message-ID: <20190505221544.31568-8-philmd@redhat.com> (raw)
In-Reply-To: <20190505221544.31568-1-philmd@redhat.com>

Signed-off-by: Stephen Checkoway <stephen.checkoway@oberlin.edu>
Message-Id: <20190426162624.55977-3-stephen.checkoway@oberlin.edu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: Extracted from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/block/pflash_cfi02.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 9673eee969f..1e006e7bf3a 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -241,10 +241,10 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset,
         case 0x0E:
         case 0x0F:
             ret = boff & 0x01 ? pfl->ident3 : pfl->ident2;
-            if (ret == (uint8_t)-1) {
-                goto flash_read;
+            if (ret != (uint8_t)-1) {
+                break;
             }
-            break;
+            /* Fall through to data read. */
         default:
             goto flash_read;
         }
-- 
2.20.1

WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Stephen Checkoway <stephen.checkoway@oberlin.edu>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
	qemu-block@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through
Date: Mon,  6 May 2019 00:15:38 +0200	[thread overview]
Message-ID: <20190505221544.31568-8-philmd@redhat.com> (raw)
Message-ID: <20190505221538.lAnQKdLmtiDNZyP5QMb2Glmyg_iCBJmz85KNw46x7cM@z> (raw)
In-Reply-To: <20190505221544.31568-1-philmd@redhat.com>

Signed-off-by: Stephen Checkoway <stephen.checkoway@oberlin.edu>
Message-Id: <20190426162624.55977-3-stephen.checkoway@oberlin.edu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: Extracted from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/block/pflash_cfi02.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 9673eee969f..1e006e7bf3a 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -241,10 +241,10 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset,
         case 0x0E:
         case 0x0F:
             ret = boff & 0x01 ? pfl->ident3 : pfl->ident2;
-            if (ret == (uint8_t)-1) {
-                goto flash_read;
+            if (ret != (uint8_t)-1) {
+                break;
             }
-            break;
+            /* Fall through to data read. */
         default:
             goto flash_read;
         }
-- 
2.20.1



  parent reply	other threads:[~2019-05-05 22:16 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-05 22:15 [Qemu-devel] [PATCH 00/13] hw/block/pflash_cfi02: Clean-up and fixes Philippe Mathieu-Daudé
2019-05-05 22:15 ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 01/13] tests/pflash-cfi02: Add test for supported CFI commands Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 02/13] tests/pflash-cfi02: Use the GLib API Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 03/13] tests/pflash-cfi02: Use IEC binary prefixes for size constants Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 04/13] hw/block/pflash_cfi02: Fix debug format string Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 05/13] hw/block/pflash_cfi02: Add an enum to define the write cycles Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 06/13] hw/block/pflash_cfi02: Add helpers to manipulate the status bits Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` Philippe Mathieu-Daudé [this message]
2019-05-05 22:15   ` [Qemu-devel] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 08/13] hw/block/pflash_cfi02: Use the ldst API in pflash_write() Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 09/13] hw/block/pflash_cfi02: Use the ldst API in pflash_read() Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 10/13] hw/block/pflash_cfi02: Extract the pflash_data_read() function Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 11/13] hw/block/pflash_cfi02: Unify the MemoryRegionOps Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 12/13] hw/block/pflash_cfi02: Fix command address comparison Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-05-05 22:15 ` [Qemu-devel] [PATCH 13/13] hw/block/pflash_cfi02: Use the chip erase time specified in the CFI table Philippe Mathieu-Daudé
2019-05-05 22:15   ` Philippe Mathieu-Daudé
2019-06-26 20:33 ` [Qemu-devel] [Qemu-block] [PATCH 00/13] hw/block/pflash_cfi02: Clean-up and fixes John Snow
2019-06-26 21:06   ` Philippe Mathieu-Daudé
2019-06-26 21:09     ` John Snow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190505221544.31568-8-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stephen.checkoway@oberlin.edu \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).