From nobody Tue Feb 10 20:08:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635613671; cv=none; d=zohomail.com; s=zohoarc; b=M+omqzFI1LCdAcWelAfsvsL2CHA0+6KFRnCqdaTWp6NNy+Opx+bGo9ggbX+AzBuX7GnTo9Aor4nZK8PAYGCmTXmWoLLQkEGPsTKU5bM50rowGMvW4v3+c7XBUYxlqPPab5rQxNXq+8GoFag7CNVym8WPeGh0a1jJPOAacbQlA7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635613671; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p7bJRN4ZOfCVNtZFFg00y8FB3usZUZC2d+MVd9Rc13o=; b=dYSg5gqUEhugDdYQHYMXQzjNCvKRdS5xSfOJkQB8IzOo7RUIcaUhFEbGDeyKRt1ZOzgYmVMN2Kd46ADvF5QJzrXM02gQwGKcVM5zJOt8SK/+2Kf7mgIY0v5oTWG7ye92iP+aCwqJ5aO3uGPMYbppVQ/4r8/XN4t82QeEkiSpnCc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1635613671756379.5736431753328; Sat, 30 Oct 2021 10:07:51 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id s13so14467443wrb.3 for ; Sat, 30 Oct 2021 10:07:51 -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 126sm11331814wmz.28.2021.10.30.10.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:07:49 -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=p7bJRN4ZOfCVNtZFFg00y8FB3usZUZC2d+MVd9Rc13o=; b=Us/i3AufC/1h50YW3XmPMB43ifquFUbo08Gs+4c3K0kOhLOIglxbM/XuFTEauCKYcx y/RKkr9K+jBEOlOal5yuf2l85TUtmpgCPqIzaJMJmie+8IbFuGjJcp12N2oZo8EpVNXf WCOt4jaxafN1oG9DYdMwVRwD8/qVeZOFVQ3MpyZbJV2LazeHV0HiT8CF5wxQWwXnQ/y2 QFP0IGOK3aXDU4FuoVLMlZ3cYwdVVfXlVPycP+3WN9R7viVASeMo952Y016WeCjzPovJ sPFWTAD4VXN3LRha/5dyyEQAzmy9tms2v2CcYFk5TcTVIVA6ZDAb05LIE7x+fdX8SZP1 J3+Q== 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=p7bJRN4ZOfCVNtZFFg00y8FB3usZUZC2d+MVd9Rc13o=; b=27+flFMrCFeRbG21+VgZz4wHyasVmB5ZHC/D0GsV6H0wL3GtecfBQzgXJCiyeSAn7v 4Jcnv+/OrtCRlbRvQJOzuwaDCO/iAQyR6BApjVtnB0RJCI9uoIlDIusuGD3KpgOTiFdS SirZdZ16XTw4eYCNIorXNuiaqq6ruqUluLS54qHVteIQ6r8dTe0joUDuS7W04UcKwPBy H+KrGPT0k9+fXZeTQGAkRdIjVzx+SCc3+YiACHe4eOt7AM3UtZ1Y+Wfio8DApOzG/nAF rZW6ptARPNHGrIqqhZxrAxFxWtgOp619bkP4TxAdyzT5HY8EFtdugVuonUQr5E9RpeXi Avfw== X-Gm-Message-State: AOAM531WSJiJS0HQlYTtMaNsyQ0LoRJbapgpRLYO/HDtjOqC9ABDDIeK 6XdHlihGcQHqsbKqqlDLv8Q= X-Google-Smtp-Source: ABdhPJxBMxkpuE77ll0tUG/9xgMPEWKfzbWOQ3Wuo6mNfbQ/Mfe2UBmTvG/Oy2lCUf/vz73kS/M5+g== X-Received: by 2002:a5d:6c62:: with SMTP id r2mr23087052wrz.284.1635613670067; Sat, 30 Oct 2021 10:07:50 -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 , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 19/30] hw/intc/sh_intc: Move sh_intc_register() closer to its only user Date: Sat, 30 Oct 2021 19:06:04 +0200 Message-Id: <20211030170615.2636436-20-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: 1635613672270100001 From: BALATON Zoltan The sh_intc_register() function is only used at one place. Move them together so it's easier to see what's going on. Signed-off-by: BALATON Zoltan Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <49f2742bc67cba7164385fafad204ab1e1bd3a0b.1635541329.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/sh_intc.c | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index b908be0ff5b..1a2824f8e0c 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -269,36 +269,6 @@ struct intc_source *sh_intc_source(struct intc_desc *d= esc, intc_enum id) return NULL; } =20 -static unsigned int sh_intc_register(MemoryRegion *sysmem, - struct intc_desc *desc, - const unsigned long address, - const char *type, - const char *action, - const unsigned int index) -{ - char name[60]; - MemoryRegion *iomem, *iomem_p4, *iomem_a7; - - if (!address) { - return 0; - } - - iomem =3D &desc->iomem; - iomem_p4 =3D desc->iomem_aliases + index; - iomem_a7 =3D iomem_p4 + 1; - - snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "p4"); - memory_region_init_alias(iomem_p4, NULL, name, iomem, A7ADDR(address),= 4); - memory_region_add_subregion(sysmem, P4ADDR(address), iomem_p4); - - snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "a7"); - memory_region_init_alias(iomem_a7, NULL, name, iomem, A7ADDR(address),= 4); - memory_region_add_subregion(sysmem, A7ADDR(address), iomem_a7); - - /* used to increment aliases index */ - return 2; -} - static void sh_intc_register_source(struct intc_desc *desc, intc_enum source, struct intc_group *groups, @@ -398,6 +368,36 @@ void sh_intc_register_sources(struct intc_desc *desc, } } =20 +static unsigned int sh_intc_register(MemoryRegion *sysmem, + struct intc_desc *desc, + const unsigned long address, + const char *type, + const char *action, + const unsigned int index) +{ + char name[60]; + MemoryRegion *iomem, *iomem_p4, *iomem_a7; + + if (!address) { + return 0; + } + + iomem =3D &desc->iomem; + iomem_p4 =3D desc->iomem_aliases + index; + iomem_a7 =3D iomem_p4 + 1; + + snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "p4"); + memory_region_init_alias(iomem_p4, NULL, name, iomem, A7ADDR(address),= 4); + memory_region_add_subregion(sysmem, P4ADDR(address), iomem_p4); + + snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "a7"); + memory_region_init_alias(iomem_a7, NULL, name, iomem, A7ADDR(address),= 4); + memory_region_add_subregion(sysmem, A7ADDR(address), iomem_a7); + + /* used to increment aliases index */ + return 2; +} + int sh_intc_init(MemoryRegion *sysmem, struct intc_desc *desc, int nr_sources, --=20 2.31.1