From patchwork Fri Feb 19 13:17:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 585207 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6CC39140556 for ; Sat, 20 Feb 2016 00:21:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=dk4k6AF0; dkim-atps=neutral Received: from localhost ([::1]:52226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWl0I-0008Aw-FI for incoming@patchwork.ozlabs.org; Fri, 19 Feb 2016 08:21:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWkwE-00013Z-Sp for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWkwD-00069Y-TE for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:17:38 -0500 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:33540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWkwD-00069C-Mm for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:17:37 -0500 Received: by mail-wm0-x22d.google.com with SMTP id g62so68311401wme.0 for ; Fri, 19 Feb 2016 05:17:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+hgoi7lk5JE8yuGudR8QMBPqLwGzMQ6m4XeCvTw2G6A=; b=dk4k6AF0VFS1jEqwXK96Zynf7p4yWWkCKK9N9lwk4qNSktVC303ubZ/6GjFXKmE0j1 ZnrpPkkLJ4zTTrgU2eCribUNREK+v2L/3JS44J/GqznT6/CGs4+Td8R7G5ONLPKD/5o6 ohKQfx4YhBgAMAlkawbhB+InyUPFqlSnBt+hI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+hgoi7lk5JE8yuGudR8QMBPqLwGzMQ6m4XeCvTw2G6A=; b=CtN4mmhpW9nC+xqkvsogH69TmEZEY5VzV6GoHnlfu3k3yu6SQ91EK9IClyD8xFD245 VupFrnhIvh84OKxeVOQ1s5rJtaB/d7Cm93GWORg8yl1ugxMxB8mwqOF4bZOESHJEsWOZ uJNGxtmth6jfA1PRaHsk/vvDdkBI7L4hssdJv5DT06sJ6XWrr1GGUWRkWlR3DcOGshT3 TKUeUiHSTanju7N18igO0jXTzvvO5A9z17Ue1nnkcGvCs0tf5ru7e00lMxriDBpWINWj nq4b6Bdhf76GCoca7D3Pv+8V4IA325yDGte7mByu8Op0Am+Twe4thLyuVK4zrg8Dr5iT kKhQ== X-Gm-Message-State: AG10YORcWocDa6+zH73VxyPVHZrAu0RIN6I+d0SHSKbHN9TPqw4U373zp4j9uRFh7zvYfpfd X-Received: by 10.28.158.198 with SMTP id h189mr8988357wme.74.1455887857186; Fri, 19 Feb 2016 05:17:37 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by smtp.gmail.com with ESMTPSA id bg1sm11229846wjc.27.2016.02.19.05.17.35 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Feb 2016 05:17:35 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, alex.williamson@redhat.com, david@gibson.dropbear.id.au Date: Fri, 19 Feb 2016 13:17:13 +0000 Message-Id: <1455887833-7306-9-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1455887833-7306-1-git-send-email-eric.auger@linaro.org> References: <1455887833-7306-1-git-send-email-eric.auger@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22d Cc: thomas.lendacky@amd.com, thuth@redhat.com, b.reynal@virtualopensystems.com, patches@linaro.org, crosthwaitepeter@gmail.com, suravee.suthikulpanit@amd.com, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v8 8/8] hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_fdt_setprop asserts in case of error hence no need to check the returned value. Signed-off-by: Eric Auger Reviewed-by: Peter Maydell --- v6 -> v7: - add Peter's R-b v3 -> v4: fix returned value --- hw/arm/sysbus-fdt.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 9920388..04afeae 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -217,7 +217,7 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) PlatformBusDevice *pbus = data->pbus; void *fdt = data->fdt; const char *parent_node = data->pbus_node_name; - int compat_str_len, i, ret = -1; + int compat_str_len, i; char *nodename; uint32_t *irq_attr, *reg_attr; uint64_t mmio_base, irq_number; @@ -242,12 +242,8 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) reg_attr[2 * i + 1] = cpu_to_be32( memory_region_size(&vdev->regions[i]->mem)); } - ret = qemu_fdt_setprop(fdt, nodename, "reg", reg_attr, - vbasedev->num_regions * 2 * sizeof(uint32_t)); - if (ret) { - error_report("could not set reg property of node %s", nodename); - goto fail_reg; - } + qemu_fdt_setprop(fdt, nodename, "reg", reg_attr, + vbasedev->num_regions * 2 * sizeof(uint32_t)); irq_attr = g_new(uint32_t, vbasedev->num_irqs * 3); for (i = 0; i < vbasedev->num_irqs; i++) { @@ -257,17 +253,12 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) irq_attr[3 * i + 1] = cpu_to_be32(irq_number); irq_attr[3 * i + 2] = cpu_to_be32(GIC_FDT_IRQ_FLAGS_LEVEL_HI); } - ret = qemu_fdt_setprop(fdt, nodename, "interrupts", + qemu_fdt_setprop(fdt, nodename, "interrupts", irq_attr, vbasedev->num_irqs * 3 * sizeof(uint32_t)); - if (ret) { - error_report("could not set interrupts property of node %s", - nodename); - } g_free(irq_attr); -fail_reg: g_free(reg_attr); g_free(nodename); - return ret; + return 0; } /* AMD xgbe properties whose values are copied/pasted from host */