From patchwork Mon Mar 12 21:42:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 10277519 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7297660467 for ; Mon, 12 Mar 2018 21:42:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 633171FFEB for ; Mon, 12 Mar 2018 21:42:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5767E28408; Mon, 12 Mar 2018 21:42:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DD2B1FFEB for ; Mon, 12 Mar 2018 21:42:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932418AbeCLVml (ORCPT ); Mon, 12 Mar 2018 17:42:41 -0400 Received: from sauhun.de ([88.99.104.3]:43960 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932282AbeCLVmk (ORCPT ); Mon, 12 Mar 2018 17:42:40 -0400 Received: from localhost (x5ce5a6c8.dyn.telefonica.de [92.229.166.200]) by pokefinder.org (Postfix) with ESMTPSA id EFAA02C3599; Mon, 12 Mar 2018 22:42:38 +0100 (CET) From: Wolfram Sang To: qemu-devel@nongnu.org Cc: Michael Davidsaver , linux-renesas-soc@vger.kernel.org, Wolfram Sang Subject: [PATCH 1/3] nvram: at24c: remove doubled prefix for ERR Date: Mon, 12 Mar 2018 22:42:28 +0100 Message-Id: <20180312214230.17561-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> References: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ERR macro already has the TYPE_AT24C_EE prefix, no need to repeat in the error message. Signed-off-by: Wolfram Sang --- 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"); }