From patchwork Fri Sep 29 08:50:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727624 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp334646wrt; Fri, 29 Sep 2023 02:01:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHwvv2eG/NOKMeXtMYk5n3Dfwcf+urFxDdBqoJNNHBXuxN/RTUQRn2hynTBDmVJGDU8ZZYH X-Received: by 2002:a05:620a:4489:b0:775:7f6e:1920 with SMTP id x9-20020a05620a448900b007757f6e1920mr3487517qkp.17.1695978073020; Fri, 29 Sep 2023 02:01:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695978073; cv=none; d=google.com; s=arc-20160816; b=wxr9g2wQELh1tE9sS3K5Celux9LQYL/sHXaMJjH+PHnV2luxd8R6i07QtdqXrG8lZw YTyHHg43tk/GeUFqDN6TjfWAcO10sOsb74ygFigPo8b0onfIIlRQ3iaXjoro/GuQ2ciS KJFfqIWaEDOyFvvLdOiG//1HoZMNGePNpwY8j3YW9EV9yXiQJG93pqAYxovWrDxtn6ex c5KQ7d0mUCVMOFgDHA2sRSAMOI2pFk7zOAhnxln6utnKRdv0vWw5rjI1S0pGhEI3WgI1 9cFMcXiKTlW0JlZ0OYgbxhnH1L7qQqVxH+UcLGWIuyX1WcbQzX3W5KfT9hQXK4idSjt5 pnkw== 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=T4GjYDCb7xOJWXlG+vnKWW+7by992abrtrTUH3d+Z1Q=; fh=u1kk6oY/jZAcw2lMgy0QQr17FnLowJaaL+GvRwVd/XA=; b=W+fab6zYEtMUc1tmL6agKlUkq7UdPb7FZ2fhwUji7YSz1fQ651Hj/FmwdB78W/cQKo fqWLowmhQNqXy2a+nZxfE0eNsw7RnTlvsvQIYhe7mI4o91YURd/J47tSI1riCkj8lZ+2 GC22hkpWiipyqvlnei8HQma4IYaViLQcx3BBCWPCMahzxowA/LlXPjqbE2ZXcjgAjRv4 bfTE/HJMLOvUlgF1plmkh1WLDDK+gwVKfy5Auh4QLPwbacY+uEk24lKidRg/ka7RO3/0 gHbNuprpFmyrbqJWn7QWB3MqfFkTlD7o6ttLp3g+z+CFfqkZaYbDBXSCAtwsxpOcbxO9 FTTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QddJfZ4E; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v2-20020a05620a0f0200b007706b14735dsi9813760qkl.643.2023.09.29.02.01.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 02:01:12 -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=@redhat.com header.s=mimecast20190719 header.b=QddJfZ4E; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9Mi-0001qS-3Y; Fri, 29 Sep 2023 05:00:53 -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 1qm9Mb-0001mc-E5 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 05:00:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9MN-0008Bb-Nw for qemu-devel@nongnu.org; Fri, 29 Sep 2023 05:00:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695978029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T4GjYDCb7xOJWXlG+vnKWW+7by992abrtrTUH3d+Z1Q=; b=QddJfZ4E/5BOSZMNk/ssMI56TmfYgUkZ2UR4kmIe7mUMGc3bC49pAnpnw7nMcpDOX6tgB5 iKSpWurjg8sGtCklq5DKas3VjUu7KaVZjCqyw3VusCBTqae6PSr1en8jgC/aZhiAa5g/nP LiGsieMQnDoV1LVg6xvSSd+Qz9wI/Ws= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-539-cI-9u3zxNNyyh6XhV0cGvw-1; Fri, 29 Sep 2023 05:00:27 -0400 X-MC-Unique: cI-9u3zxNNyyh6XhV0cGvw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F9D5802D38; Fri, 29 Sep 2023 09:00:27 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C901176E4; Fri, 29 Sep 2023 09:00:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C8BE621E689D; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger Subject: [PULL 40/56] hw/misc/arm_sysctl.c: Avoid shadowing local variable Date: Fri, 29 Sep 2023 10:50:37 +0200 Message-ID: <20230929085053.2789105-41-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 From: Peter Maydell Avoid shadowing a local variable in arm_sysctl_write(): ../../hw/misc/arm_sysctl.c: In function ‘arm_sysctl_write’: ../../hw/misc/arm_sysctl.c:537:26: warning: declaration of ‘val’ shadows a parameter [-Wshadow=local] 537 | uint32_t val; | ^~~ ../../hw/misc/arm_sysctl.c:388:39: note: shadowed declaration is here 388 | uint64_t val, unsigned size) | ~~~~~~~~~^~~ Signed-off-by: Peter Maydell Message-ID: <20230922152944.3583438-3-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Markus Armbruster --- hw/misc/arm_sysctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 42d4693854..3e4f4b0524 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -534,12 +534,12 @@ static void arm_sysctl_write(void *opaque, hwaddr offset, s->sys_cfgstat |= 2; /* error */ } } else { - uint32_t val; + uint32_t data; if (!vexpress_cfgctrl_read(s, dcc, function, site, position, - device, &val)) { + device, &data)) { s->sys_cfgstat |= 2; /* error */ } else { - s->sys_cfgdata = val; + s->sys_cfgdata = data; } } }