From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: qemu-devel@nongnu.org
Cc: Michael Davidsaver <mdavidsaver@gmail.com>,
linux-renesas-soc@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: [Qemu-devel] [PATCH 1/3] nvram: at24c: remove doubled prefix for ERR
Date: Mon, 12 Mar 2018 22:42:28 +0100 [thread overview]
Message-ID: <20180312214230.17561-2-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20180312214230.17561-1-wsa+renesas@sang-engineering.com>
The ERR macro already has the TYPE_AT24C_EE prefix, no need to repeat in
the error message.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
hw/nvram/eeprom_at24c.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index 5494351976..8507516b7e 100644
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -60,8 +60,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
if (ee->blk && ee->changed) {
int len = blk_pwrite(ee->blk, 0, ee->mem, ee->rsize, 0);
if (len != ee->rsize) {
- ERR(TYPE_AT24C_EE
- " : failed to write backing file\n");
+ ERR("failed to write backing file\n");
}
DPRINTK("Wrote to backing file\n");
}
@@ -127,7 +126,7 @@ int at24c_eeprom_init(I2CSlave *i2c)
int64_t len = blk_getlength(ee->blk);
if (len != ee->rsize) {
- ERR(TYPE_AT24C_EE " : Backing file size %lu != %u\n",
+ ERR("Backing file size %lu != %u\n",
(unsigned long)len, (unsigned)ee->rsize);
exit(1);
}
@@ -135,8 +134,7 @@ int at24c_eeprom_init(I2CSlave *i2c)
if (blk_set_perm(ee->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE,
BLK_PERM_ALL, &error_fatal) < 0)
{
- ERR(TYPE_AT24C_EE
- " : Backing file incorrect permission\n");
+ ERR("Backing file incorrect permission\n");
exit(1);
}
}
@@ -158,8 +156,7 @@ void at24c_eeprom_reset(DeviceState *state)
int len = blk_pread(ee->blk, 0, ee->mem, ee->rsize);
if (len != ee->rsize) {
- ERR(TYPE_AT24C_EE
- " : Failed initial sync with backing file\n");
+ ERR("Failed initial sync with backing file\n");
}
DPRINTK("Reset read backing file\n");
}
--
2.11.0
next prev parent reply other threads:[~2018-03-12 21:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 21:42 [Qemu-devel] [PATCH 0/3] nvram: at24c: fix problems related to "rom-size" Wolfram Sang
2018-03-12 21:42 ` Wolfram Sang [this message]
2018-03-13 10:57 ` [Qemu-devel] [PATCH 1/3] nvram: at24c: remove doubled prefix for ERR Philippe Mathieu-Daudé
2018-03-13 20:10 ` Wolfram Sang
2018-03-12 21:42 ` [Qemu-devel] [PATCH 2/3] nvram: at24c: prevent segfault by checking "rom-size" Wolfram Sang
2018-03-13 10:59 ` Philippe Mathieu-Daudé
2018-03-12 21:42 ` [Qemu-devel] [PATCH 3/3] nvram: at24c: use a sane default for "rom-size" Wolfram Sang
2018-03-13 10:53 ` Philippe Mathieu-Daudé
2018-03-13 20:16 ` Wolfram Sang
2018-03-18 23:50 ` Philippe Mathieu-Daudé
2018-03-19 8:33 ` Wolfram Sang
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=20180312214230.17561-2-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mdavidsaver@gmail.com \
--cc=qemu-devel@nongnu.org \
/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).