Commit fcf13ca5 authored by Thomas Huth's avatar Thomas Huth Committed by Peter Maydell
Browse files

hw/arm/mps2-tz: Replace init_sysbus_child() with sysbus_init_child_obj() 



Now that we've got the common sysbus_init_child_obj() function, we do
not need the local init_sysbus_child() anymore.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 1534420566-15799-1-git-send-email-thuth@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 64d450a0

hw/arm/mps2-tz.c

+11 −21
Original line number Diff line number Diff line
@@ -107,16 +107,6 @@ static void make_ram_alias(MemoryRegion *mr, const char *name, 
    memory_region_add_subregion(get_system_memory(), base, mr);

}



static void init_sysbus_child(Object *parent, const char *childname,

                              void *child, size_t childsize,

                              const char *childtype)

{

    object_initialize(child, childsize, childtype);

    object_property_add_child(parent, childname, OBJECT(child), &error_abort);

    qdev_set_parent_bus(DEVICE(child), sysbus_get_default());



}



/* Most of the devices in the AN505 FPGA image sit behind

 * Peripheral Protection Controllers. These data structures

 * define the layout of which devices sit behind which PPCs.
@@ -149,7 +139,7 @@ static MemoryRegion *make_unimp_dev(MPS2TZMachineState *mms, 
     */

    UnimplementedDeviceState *uds = opaque;



    init_sysbus_child(OBJECT(mms), name, uds,

    sysbus_init_child_obj(OBJECT(mms), name, uds,

                          sizeof(UnimplementedDeviceState),

                          TYPE_UNIMPLEMENTED_DEVICE);

    qdev_prop_set_string(DEVICE(uds), "name", name);
@@ -170,8 +160,8 @@ static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque, 
    DeviceState *iotkitdev = DEVICE(&mms->iotkit);

    DeviceState *orgate_dev = DEVICE(&mms->uart_irq_orgate);



    init_sysbus_child(OBJECT(mms), name, uart,

                      sizeof(mms->uart[0]), TYPE_CMSDK_APB_UART);

    sysbus_init_child_obj(OBJECT(mms), name, uart, sizeof(mms->uart[0]),

                          TYPE_CMSDK_APB_UART);

    qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i));

    qdev_prop_set_uint32(DEVICE(uart), "pclk-frq", SYSCLK_FRQ);

    object_property_set_bool(OBJECT(uart), true, "realized", &error_fatal);
@@ -248,8 +238,8 @@ static MemoryRegion *make_mpc(MPS2TZMachineState *mms, void *opaque, 


    memory_region_init_ram(ssram, NULL, name, ramsize[i], &error_fatal);



    init_sysbus_child(OBJECT(mms), mpcname, mpc,

                      sizeof(mms->ssram_mpc[0]), TYPE_TZ_MPC);

    sysbus_init_child_obj(OBJECT(mms), mpcname, mpc, sizeof(mms->ssram_mpc[0]),

                          TYPE_TZ_MPC);

    object_property_set_link(OBJECT(mpc), OBJECT(ssram),

                             "downstream", &error_fatal);

    object_property_set_bool(OBJECT(mpc), true, "realized", &error_fatal);
@@ -288,7 +278,7 @@ static void mps2tz_common_init(MachineState *machine) 
        exit(1);

    }



    init_sysbus_child(OBJECT(machine), "iotkit", &mms->iotkit,

    sysbus_init_child_obj(OBJECT(machine), "iotkit", &mms->iotkit,

                          sizeof(mms->iotkit), TYPE_IOTKIT);

    iotkitdev = DEVICE(&mms->iotkit);

    object_property_set_link(OBJECT(&mms->iotkit), OBJECT(system_memory),
@@ -421,7 +411,7 @@ static void mps2tz_common_init(MachineState *machine) 
        int port;

        char *gpioname;



        init_sysbus_child(OBJECT(machine), ppcinfo->name, ppc,

        sysbus_init_child_obj(OBJECT(machine), ppcinfo->name, ppc,

                              sizeof(TZPPC), TYPE_TZ_PPC);

        ppcdev = DEVICE(ppc);