[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 8/8] hw/arm/sysbus-fdt: remove qemu_fdt_setprop r
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v8 8/8] hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check |
Date: |
Fri, 19 Feb 2016 13:17:13 +0000 |
qemu_fdt_setprop asserts in case of error hence no need to check
the returned value.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
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 */
--
1.8.3.2
- [Qemu-devel] [PATCH v8 0/8] AMD XGBE KVM platform passthrough, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 1/8] hw/vfio/platform: amd-xgbe device, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 2/8] device_tree: introduce load_device_tree_from_sysfs, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 3/8] device_tree: introduce qemu_fdt_node_path, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 4/8] device_tree: qemu_fdt_getprop converted to use the error API, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 6/8] hw/arm/sysbus-fdt: helpers for clock node generation, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 7/8] hw/arm/sysbus-fdt: enable amd-xgbe dynamic instantiation, Eric Auger, 2016/02/19
- [Qemu-devel] [PATCH v8 8/8] hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check,
Eric Auger <=
- [Qemu-devel] [PATCH v8 5/8] device_tree: qemu_fdt_getprop_cell converted to use the error API, Eric Auger, 2016/02/19