From nobody Mon Feb 9 00:56:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635374343615564.3327204016128; Wed, 27 Oct 2021 15:39:03 -0700 (PDT) Received: from localhost ([::1]:50716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfrZW-0005Zx-0Q for importer@patchew.org; Wed, 27 Oct 2021 18:39:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfrMO-0007x9-O8 for qemu-devel@nongnu.org; Wed, 27 Oct 2021 18:25:29 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:39549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfrMK-0002nf-TW for qemu-devel@nongnu.org; Wed, 27 Oct 2021 18:25:28 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id CF8A17561DA; Thu, 28 Oct 2021 00:25:16 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 4559E7561A5; Thu, 28 Oct 2021 00:25:16 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v3 11/18] hw/intc/sh_intc: Drop another useless macro Date: Wed, 27 Oct 2021 23:54:31 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , Magnus Damm , Yoshinori Sato Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1635374344268100001 The INT_REG_PARAMS macro was only used a few times within one function on adjacent lines and is actually more complex than writing out the parameters so simplify it by expanding the macro at call sites and dropping the #define. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/intc/sh_intc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index e386372b6f..763ebbfec2 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -433,16 +433,12 @@ int sh_intc_init(MemoryRegion *sysmem, memory_region_init_io(&desc->iomem, NULL, &sh_intc_ops, desc, "intc", 0x100000000ULL); =20 -#define INT_REG_PARAMS(reg_struct, type, action, j) \ - reg_struct->action##_reg, #type, #action, j if (desc->mask_regs) { for (i =3D 0; i < desc->nr_mask_regs; i++) { struct intc_mask_reg *mr =3D desc->mask_regs + i; =20 - j +=3D sh_intc_register(sysmem, desc, - INT_REG_PARAMS(mr, mask, set, j)); - j +=3D sh_intc_register(sysmem, desc, - INT_REG_PARAMS(mr, mask, clr, j)); + j +=3D sh_intc_register(sysmem, desc, mr->set_reg, "mask", "se= t", j); + j +=3D sh_intc_register(sysmem, desc, mr->clr_reg, "mask", "cl= r", j); } } =20 @@ -450,13 +446,10 @@ int sh_intc_init(MemoryRegion *sysmem, for (i =3D 0; i < desc->nr_prio_regs; i++) { struct intc_prio_reg *pr =3D desc->prio_regs + i; =20 - j +=3D sh_intc_register(sysmem, desc, - INT_REG_PARAMS(pr, prio, set, j)); - j +=3D sh_intc_register(sysmem, desc, - INT_REG_PARAMS(pr, prio, clr, j)); + j +=3D sh_intc_register(sysmem, desc, pr->set_reg, "prio", "se= t", j); + j +=3D sh_intc_register(sysmem, desc, pr->clr_reg, "prio", "cl= r", j); } } -#undef INT_REG_PARAMS =20 return 0; } --=20 2.21.4