Commit c89e91a7 authored by Eric Auger's avatar Eric Auger Committed by Alex Williamson
Browse files

hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check 



qemu_fdt_setprop asserts in case of error hence no need to check
the returned value.

Signed-off-by: default avatarEric Auger <eric.auger@linaro.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent cf5a13e3

hw/arm/sysbus-fdt.c

+5 −14
Original line number Diff line number Diff line
@@ -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,

    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;

    }



    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 */