From nobody Tue Feb 10 20:08:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635613666; cv=none; d=zohomail.com; s=zohoarc; b=F4U5GN9rCE9vlCpek2dwJ1RvaAgsomUDrQWTkvFa0A3BqrTs9DL3UBR+zXgE3skTzVhTIvww9qaDOM5YERX2mZWQOhaRpcIGzhlZThT/0gL1vIKEwI92PSVGwlqpLIzMX4x10Y2HW2WufgNlUF49/cw7PtAAcy6TswSZ0MwIo08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635613666; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BqzEw7yUxiaZ94tLfUkzwAZHnZ1n+ceNrdq9HHkBLlI=; b=YnmbA1BrT3wnXa//Av5KTFkD9Pal33x23SMHUQrFLf8OAx0GCQX+MzJnDZaCi6YglfNHGMBrr59rBsbij7n7CHET9DF5lmp7xdDTfk5YEm4zdaCpbdgnWanYXFIRJ+iUZXDlXm9L1YsVGtF3Wg/Znmg2RqJ9gTNxYZSIyT+B0hY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1635613666974271.47800067334094; Sat, 30 Oct 2021 10:07:46 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id c71-20020a1c9a4a000000b0032cdcc8cbafso6169855wme.3 for ; Sat, 30 Oct 2021 10:07:46 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id t6sm7930369wmq.31.2021.10.30.10.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BqzEw7yUxiaZ94tLfUkzwAZHnZ1n+ceNrdq9HHkBLlI=; b=iuYwz4GREiMoshQjb6UJgdhCRJIOUv4Fxec16uUB3mvr7mgMt7/KHqgnwVXlUhZQGs OrcDo6U3HQpA9ByUJGje2CBlwvBtmAsERcKsTHqAJUd3kFAxxFlxrUDdD96//f+Ble+4 w2edkm1/iWWHoWvIUR7FyysQOBI4EKivSXVZgHNZPMFuzdwakAPFFmQ/sCzkL2u4dsrh dKXdM7t+kNNH79SJwOJVh5kfhl84f5YXaZdESZKgjx+M9/GmW827jgTBVlD9hyfTu3jE jxX+GMuLjIGtksZq/YNDOvnfeCvfXSUHK/Cmy2QfCluF4vcm1d6PffJflG53HpAaoTVX BVaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BqzEw7yUxiaZ94tLfUkzwAZHnZ1n+ceNrdq9HHkBLlI=; b=aGBCbfK5VPUrjlxALCoTt5MhH2gvbe5Sw+TDA6AblKDKIcuE5VlIaZzLu/62QX1lmo W5tuqpx9ob2CQLx6ikFTEmcSQLuydB96t0caqlovwUiSgG8Vfqyh6EvVtqSVVCNg4vj5 UnINUMSl8e3knUamPLvSGQhhSsxoiI17IhtruIWS4HiJbv004A4+YMZpJCtgoW8iF3/E FaP6bEde11Mi4ec0RjR4wS5qyBuU8CJZ9cz4AhfLphKylz8yeyuYWE1CnnRX619UiIdU y3wY+VWXJOsR9LbcdZymfYGOtVuxQITo+nSluLBVnETbjsOU62VjLF8TfOjt57hd6Jkz rRyg== X-Gm-Message-State: AOAM530v7Az/2S/uciQL8F3tim9YImoX+Dh0noME7MIGQYwMg4GnBu40 XZxIai3TMNNrg3x02xR864Q= X-Google-Smtp-Source: ABdhPJyyBwvBfEGThcbdy+Je2bgd9jlN7j+vACan5Dp8aFTxqyWUhwwSXY/Lk3h0MO/C2Jl/lRtF6Q== X-Received: by 2002:a05:600c:35d0:: with SMTP id r16mr27623800wmq.97.1635613665245; Sat, 30 Oct 2021 10:07:45 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Yoshinori Sato , Magnus Damm , Paolo Bonzini , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 18/30] hw/intc/sh_intc: Drop another useless macro Date: Sat, 30 Oct 2021 19:06:03 +0200 Message-Id: <20211030170615.2636436-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211030170615.2636436-1-f4bug@amsat.org> References: <20211030170615.2636436-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635613668010100001 From: BALATON Zoltan 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 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 175d12b371c..b908be0ff5b 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -432,16 +432,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 @@ -449,13 +445,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.31.1