From patchwork Mon Sep 4 16:28:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 720005 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp1694623wrh; Mon, 4 Sep 2023 09:29:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGi6VztzFb3YTSlp3DlSpMV2MVcwwfKfGs8DvFglgs1YbRK+My2Z74Gf95IO7YD0ik6y7Eh X-Received: by 2002:a05:620a:4687:b0:76e:f3a9:1e12 with SMTP id bq7-20020a05620a468700b0076ef3a91e12mr15309986qkb.1.1693844959106; Mon, 04 Sep 2023 09:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693844959; cv=none; d=google.com; s=arc-20160816; b=CUGmtwXpU9nSuzenvOXGKkuT43Q6pqENAk0poqVP0smupUZnrfI5CVg/yx46pkWmXO sI0hlrbMXkfwyUKO6xU56I1ynoJvwF1ClFn9xKiAJtM2eYUzneOi+WrGuVSVVubSLeQS lniv75xHkRvDc4hHM2lTK/MLV+8pDYIVkR6Tuza3LDjqz0VgEOt40aYFOwalUNDuJzU/ rOSqihl2qUak2cpcDyImGopJSU3DXjUpbRCuUqfs1VfjaNL5z5rpajf2hZW6hkvwa4Es pSlorzVfarq7jljd5N1jOVvU2vjVVnXm1m7ZxRU4ln393WFdAn58WsYqSDe2WfuhaQcb UBDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/gYF3UNN3lFc0Z73zh6TAcygqYQkjiaj790AQYKykAQ=; fh=Beq8HmRjTEPjpc7hnl1+lgL1Ts2uJq+tMwAeiaqV23U=; b=ZQNNzUsH9A95tEyyKXVF/1FFwjKVtbpmoRP/T6n0bv9c2Uien2rtEA/RIAxrSxdNe/ RaR6u1IL4WnJ5Qzrgj7UXVODwZi7lpZjumHwqHB4UeO9ukqk1p95D7qtW5969qKi/r7w nPPyJfJssfwezPHQqgSH1bREbyggly/Ugk4odM7mRmY0nQGJBxt0KzApkwM7G5tcrLrM Xm98Uy3sBt4wuTmJ6qDItRH++yMO+sHwawo052yh5qhFwy8HgfIv9c7zK0SdOTINXM3P WfVViuJ814I/am72/heBu0h1i4gATH4rcmuveUILmtjOIUuseBYoR7gLRvgS11C+uOIF yDEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=whs90MOB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w28-20020a05620a0e9c00b0076d7d1c7f17si6660076qkm.526.2023.09.04.09.29.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Sep 2023 09:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=whs90MOB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdCRX-00025o-AL; Mon, 04 Sep 2023 12:28:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qdCRO-00022k-Tj for qemu-devel@nongnu.org; Mon, 04 Sep 2023 12:28:42 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdCRL-0002Ln-8s for qemu-devel@nongnu.org; Mon, 04 Sep 2023 12:28:42 -0400 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-52c74a2e8edso2368641a12.1 for ; Mon, 04 Sep 2023 09:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693844917; x=1694449717; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/gYF3UNN3lFc0Z73zh6TAcygqYQkjiaj790AQYKykAQ=; b=whs90MOBGaBS40P1h/mz92M+WAyQhZ1Z5eVPjTxJu0GRFhsbq97Cbk/YDvlAG75CrI MoptHJkSfFIsDYDSix6KhjMi3tXKqEdqmCeeXXK+q7ZMJLRiWCJp3PFy8sT585epBamx /1EsYVpZatIUZMRWicAvuynYYBgqolZweQNdOU5ELM1ZL51kMZInnusJ22V+YKYk/Ovs CA5VR0Tu5DVZ1HXL0AXhMdsS9udqm/NlwDOJKnuX0wwLQknMuABRwWNpAF+q3FL7lskB G9NfeOw7v5YyguipwmDIRq1BZl0o310aPoL2WS5JLKA+fcd/ar4MtncAvbSiCvtAE66C CbBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693844917; x=1694449717; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/gYF3UNN3lFc0Z73zh6TAcygqYQkjiaj790AQYKykAQ=; b=lZzMwc4g+j1YnquX6BeN9LKrKdgMVtwxGc/13TnodCt5+kfuJ+wep+A/bZX66+1TR/ iH+xGYCZG0eKBiRXvyu+FmqnT6NTmWCRAR2+9qp8/c70FIFEPxWjs6M2Jqm8tJ94CUOy oFXx7Dxl5GeKh3Rq/BVX0KrqSRmvW3XbkV4y5W/RFxS1HXxYqcj8Y9c2M6or4jCSvOji Im0X/fI+uOzllrfXltV1zFZ9vikffdcmnzZUa3abe5zGBjHLQexLtLMGxHfZJR+D4QSJ CoBIeN8MVluo1kr8HYuWCq/Tt3A5vYvkej/a/SHDTPf8ehLz9BVe4hiyrdzx7wq8Epic ADLg== X-Gm-Message-State: AOJu0YxbcH13kZbetBvUGW/WUU0pGnRb+CrIOXKbLLj57HyEYwpBTAzY LWFcQ7/55ub1GNK5f9R/9fH+CzZgG/F+52URtOw= X-Received: by 2002:aa7:d58f:0:b0:52b:d169:b374 with SMTP id r15-20020aa7d58f000000b0052bd169b374mr8715679edq.3.1693844917397; Mon, 04 Sep 2023 09:28:37 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.227]) by smtp.gmail.com with ESMTPSA id c20-20020aa7c994000000b0052a3c7c9e8bsm6037394edt.56.2023.09.04.09.28.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 04 Sep 2023 09:28:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH 2/3] hw/intc/openpic: Clean up local variable shadowing Date: Mon, 4 Sep 2023 18:28:23 +0200 Message-ID: <20230904162824.85385-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230904162824.85385-1-philmd@linaro.org> References: <20230904162824.85385-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=philmd@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fix: hw/intc/openpic.c: In function ‘openpic_gbl_write’: hw/intc/openpic.c:614:17: warning: declaration of ‘idx’ shadows a previous local [-Wshadow=compatible-local] 614 | int idx; | ^~~ hw/intc/openpic.c:568:9: note: shadowed declaration is here 568 | int idx; | ^~~ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- hw/intc/openpic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index c757adbe53..a6f91d4bcd 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -610,11 +610,8 @@ static void openpic_gbl_write(void *opaque, hwaddr addr, uint64_t val, case 0x10B0: case 0x10C0: case 0x10D0: - { - int idx; - idx = (addr - 0x10A0) >> 4; - write_IRQreg_ivpr(opp, opp->irq_ipi0 + idx, val); - } + idx = (addr - 0x10A0) >> 4; + write_IRQreg_ivpr(opp, opp->irq_ipi0 + idx, val); break; case 0x10E0: /* SPVE */ opp->spve = val & opp->vector_mask;