From patchwork Fri Sep 29 08:50:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727612 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp332626wrt; Fri, 29 Sep 2023 01:54:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFg3F8Dt/Tpe+kuwrpq6ZWz4qw1G311C6EeUYkqNz3cH19qlDZCAxt+N4Rz8uuVYOpNZ3DG X-Received: by 2002:a0c:b219:0:b0:655:dc84:d744 with SMTP id x25-20020a0cb219000000b00655dc84d744mr3491778qvd.25.1695977673119; Fri, 29 Sep 2023 01:54:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977673; cv=none; d=google.com; s=arc-20160816; b=QrIe5ASU143VboR8+2Ol2kGCJjpjjpp2l9cimgWxe1Zs6+CoWP8PcwuyOvhfWx1kWA wOnzOCQ9L+2NxPDCbc+mpgj9X6s0kbrYuiRvH+49Tn9KXvmupvU4xp/ZpjQw7F8bzp2q 9JJwlq27TWhwxuQVOfahxz/no5sm4zEGK+tfbxfbscK1YcsK7cs3dIjxyCI2I+77z6xB jQ3zEM0m87UUnAx65bsbNlECviZ2DHG135X6QuSm48p/tUijvF1mzp0HrFnB7v/q6E72 cTImwy+pSAOctM0xrfwgGM9JpYl8avyFlwePtApJumTO5dQ+gnblMyTR/kW0xnICct+1 bQUg== 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=AuY4c+rNgBEthHETX4q54zFauPLIMdPU3WaalCkJm9Q=; fh=vkIKEHcwKJya0eJ7ZEuSZlQ+z9UQVjOKAU0iaZuC/Ks=; b=Boj7WBj4jOkjefb/3kl/FRE9WKveeL1mzNh0O6BNHAnQNqb6DE1olZlBCLvaZZ/PdC HmTO1up+LJ93xWZLIF8X2/H/aIHl17Fct5mFNBB9dUfLGgM+Ou7GXQ+rQcbfXqZp6FhS 029yd4waxgLP8I1rnVN4B2iIBmQbddh0r6fQzLoE6PaJ3F4kPqtLkEkqDS6SBTRkvqCu nKBA7WYXwdDGchNIQ4xRzTaghwNCi7zpfLABycg7B4/wPoBj6njgiE+oC2KoV/YVd8Lk NxlgtLyBYBaDIjMShIWkzD+g6cjp4tR43S9V8sV+a6E3gyr0UGPkYn1bYg4obUPpF1/2 /I/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AspphZuM; 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 y19-20020a0cd993000000b006594b2aa67csi4305059qvj.478.2023.09.29.01.54.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:54:33 -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=AspphZuM; 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 1qm9DU-00050u-0f; Fri, 29 Sep 2023 04:51:20 -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 1qm9DK-0004xK-5s for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:11 -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 1qm9DA-0005b8-D8 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977458; 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=AuY4c+rNgBEthHETX4q54zFauPLIMdPU3WaalCkJm9Q=; b=AspphZuMzcaHL5ZbAroA5Evo5QFhaqLi73Dw5XFt2rAmc+azTfks9A+5FsQOsh/8ksA0Ik WQBFQN2XN11LnwNMVD48mcPY/53GUFvR1OnrOnHU2Q5FTIe5rhv0IurowQhw12XUbuibLH xT8IoSp4yg7DFnOG5nA9xd2L+jSB8yo= 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-561-7qdX-6meORW_pPDDNtpf7Q-1; Fri, 29 Sep 2023 04:50:56 -0400 X-MC-Unique: 7qdX-6meORW_pPDDNtpf7Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 92239801779; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F52E10F1BE7; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 83B4621E6882; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 18/56] hw/microblaze: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:15 +0200 Message-ID: <20230929085053.2789105-19-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.3 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Philippe Mathieu-Daudé Fix: hw/microblaze/petalogix_ml605_mmu.c: In function ‘petalogix_ml605_init’: hw/microblaze/petalogix_ml605_mmu.c:186:24: warning: declaration of ‘dinfo’ shadows a previous local [-Wshadow=compatible-local] 186 | DriveInfo *dinfo = drive_get(IF_MTD, 0, i); | ^~~~~ hw/microblaze/petalogix_ml605_mmu.c:78:16: note: shadowed declaration is here 78 | DriveInfo *dinfo; | ^~~~~ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904161235.84651-14-philmd@linaro.org> Signed-off-by: Markus Armbruster --- hw/microblaze/petalogix_ml605_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index ea0fb68cf0..fb7889cf67 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -183,7 +183,7 @@ petalogix_ml605_init(MachineState *machine) spi = (SSIBus *)qdev_get_child_bus(dev, "spi"); for (i = 0; i < NUM_SPI_FLASHES; i++) { - DriveInfo *dinfo = drive_get(IF_MTD, 0, i); + dinfo = drive_get(IF_MTD, 0, i); qemu_irq cs_line; dev = qdev_new("n25q128");