From nobody Thu Nov 13 07:36:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1578461807; cv=none; d=zohomail.com; s=zohoarc; b=WUzscoExVZmLBppbB/r8107s2CfPVgRCxrSAX1fxgf1xMmlXyQixTyJMtXl6UoBZTcudYG4tF7p3NVNtDJ2kiQM+I34Oh/bo7cnpu1zs23nbsS7Aw+iBGs9+tovX4ek1eV58R6SLXM8OH9WhY+BfQPUaluhQ7eQWQ/FDEfc4i0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578461807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rygEqE0t99gMjrA0Gc00Q1Ytc5yCtS44+YfX/yPEMsI=; b=P6DWDhJE3UAcTzXWPEykPjfOAfTjXUE13ehNlZ7WET7rMqeHCShBfNLbgEEz+qas7b0u2quwNmSOTHu9rkdeemH8hwGhzuyD6pFXukNLTM1BNsDZ0T4jEoLlciPp8uXj4+BbTPROpUPynHohgGCmoL/LHvMndA0KL7tM0TIfbbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15784618077631010.0567719392783; Tue, 7 Jan 2020 21:36:47 -0800 (PST) Received: from localhost ([::1]:37146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip41N-0004os-SX for importer@patchew.org; Wed, 08 Jan 2020 00:36:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47420) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip3oZ-0003qv-M1 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 00:23:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip3oY-0002gS-JW for qemu-devel@nongnu.org; Wed, 08 Jan 2020 00:23:31 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:58611 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ip3oY-0002dJ-8H; Wed, 08 Jan 2020 00:23:30 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 47syMB2mtgz9sRp; Wed, 8 Jan 2020 16:23:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1578460998; bh=iU2bRyLYZIPuyrd3WQb8N58JS77BRz/E1w5KXyLxf3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ea/zlJERrEbJJjRZjkcBuKWQ9hIOmHNiTBt7N9QHTrrGZmArsnhFOt+Gi6uXV7zvG pXx+UA/4gQG3YOGKEerfuTdcLYCzKd7KEJY7mtzzePwwRvK7o7bQTPRaiom1tEUK/b ELcZmolZ8q09/ElRgGMNVfuy01anwqYiF4cYLlPA= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 10/26] ppc440_bamboo.c: remove label from bamboo_load_device_tree() Date: Wed, 8 Jan 2020 16:22:56 +1100 Message-Id: <20200108052312.238710-11-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200108052312.238710-1-david@gibson.dropbear.id.au> References: <20200108052312.238710-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Daniel Henrique Barboza , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza 'out' label can be replaced by 'return -1' in all cases. CC: David Gibson CC: qemu-ppc@nongnu.org Signed-off-by: Daniel Henrique Barboza Message-Id: <20200106182425.20312-3-danielhb413@gmail.com> Signed-off-by: David Gibson --- hw/ppc/ppc440_bamboo.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 4d95c0f8a8..b782641b23 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -71,12 +71,12 @@ static int bamboo_load_device_tree(hwaddr addr, =20 filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FI= LE); if (!filename) { - goto out; + return -1; } fdt =3D load_device_tree(filename, &fdt_size); g_free(filename); if (fdt =3D=3D NULL) { - goto out; + return -1; } =20 /* Manipulate device tree in memory. */ @@ -117,10 +117,6 @@ static int bamboo_load_device_tree(hwaddr addr, rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); g_free(fdt); return 0; - -out: - - return ret; } =20 /* Create reset TLB entries for BookE, spanning the 32bit addr space. */ --=20 2.24.1