qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	"Yoshinori Sato" <ysato@users.sourceforge.jp>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	"Magnus Damm" <magnus.damm@gmail.com>,
	qemu-ppc@nongnu.org, "BALATON Zoltan" <balaton@eik.bme.hu>
Subject: [PATCH 1/5] hw/ppc/sam460ex: Remove unreachable code calling pflash_cfi01_register()
Date: Mon,  9 Jan 2023 13:01:50 +0100	[thread overview]
Message-ID: <20230109120154.2868-2-philmd@linaro.org> (raw)
In-Reply-To: <20230109120154.2868-1-philmd@linaro.org>

Since its QOM'ification in commit 368a354f02 ("pflash_cfi0x:
QOMified") the pflash_cfi01_register() function does not fail.

This call was later converted with a script to use &error_fatal,
still unable to fail. Remove the unreachable code.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/ppc/sam460ex.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 4a22ce3761..cf7213f7c9 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -103,14 +103,10 @@ static int sam460ex_load_uboot(void)
     DriveInfo *dinfo;
 
     dinfo = drive_get(IF_PFLASH, 0, 0);
-    if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32),
-                               "sam460ex.flash", FLASH_SIZE,
-                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
-                               64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1)) {
-        error_report("Error registering flash memory");
-        /* XXX: return an error instead? */
-        exit(1);
-    }
+    pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32),
+                          "sam460ex.flash", FLASH_SIZE,
+                          dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
+                          64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1));
 
     if (!dinfo) {
         /*error_report("No flash image given with the 'pflash' parameter,"
-- 
2.38.1



  reply	other threads:[~2023-01-09 12:30 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-09 12:01 [PATCH 0/5] hw: Cleanups around PFLASH use Philippe Mathieu-Daudé
2023-01-09 12:01 ` Philippe Mathieu-Daudé [this message]
2023-01-09 12:38   ` [PATCH 1/5] hw/ppc/sam460ex: Remove unreachable code calling pflash_cfi01_register() BALATON Zoltan
2023-01-09 16:42   ` Bernhard Beschow
2023-01-09 16:51     ` Philippe Mathieu-Daudé
2023-01-09 12:01 ` [PATCH 2/5] hw/microblaze/petalogix: Add FLASH_SECTOR_SIZE definitions Philippe Mathieu-Daudé
2023-01-09 12:01 ` [PATCH 3/5] hw/mips/malta: Add the FLASH_SECTOR_SIZE definition Philippe Mathieu-Daudé
2023-01-09 12:01 ` [PATCH 4/5] hw/sh4/r2d: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 12:46   ` BALATON Zoltan
2023-01-09 13:12     ` Philippe Mathieu-Daudé
2023-01-09 14:02       ` BALATON Zoltan
2023-01-09 12:01 ` [PATCH 5/5] hw/sh4/r2d: Add the FLASH_SECTOR_SIZE definition Philippe Mathieu-Daudé
2023-01-09 12:49   ` BALATON Zoltan

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=20230109120154.2868-2-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=balaton@eik.bme.hu \
    --cc=edgar.iglesias@gmail.com \
    --cc=jiaxun.yang@flygoat.com \
    --cc=magnus.damm@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=ysato@users.sourceforge.jp \
    /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).