Commit b841642d authored by Alistair Francis's avatar Alistair Francis Committed by Peter Maydell
Browse files

timer: cadence_ttc: Convert to instance_init 



SysBusDevice::init is deprecated. Convert to instance_init
as prescribed by QOM conventions.

Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: 1223f14833159b9ea5c57734dd2ffa88d4b15a83.1403583596.git.alistair.francis@xilinx.com
Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 166fa999

hw/timer/cadence_ttc.c

+6 −9
Original line number Diff line number Diff line
@@ -406,21 +406,19 @@ static void cadence_timer_init(uint32_t freq, CadenceTimerState *s) 
    s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cadence_timer_tick, s);

}



static int cadence_ttc_init(SysBusDevice *dev)

static void cadence_ttc_init(Object *obj)

{

    CadenceTTCState *s = CADENCE_TTC(dev);

    CadenceTTCState *s = CADENCE_TTC(obj);

    int i;



    for (i = 0; i < 3; ++i) {

        cadence_timer_init(133000000, &s->timer[i]);

        sysbus_init_irq(dev, &s->timer[i].irq);

        sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->timer[i].irq);

    }



    memory_region_init_io(&s->iomem, OBJECT(s), &cadence_ttc_ops, s,

    memory_region_init_io(&s->iomem, obj, &cadence_ttc_ops, s,

                          "timer", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);



    return 0;

    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);

}



static void cadence_timer_pre_save(void *opaque)
@@ -474,9 +472,7 @@ static const VMStateDescription vmstate_cadence_ttc = { 
static void cadence_ttc_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);



    sdc->init = cadence_ttc_init;

    dc->vmsd = &vmstate_cadence_ttc;

}
@@ -484,6 +480,7 @@ static const TypeInfo cadence_ttc_info = { 
    .name  = TYPE_CADENCE_TTC,

    .parent = TYPE_SYS_BUS_DEVICE,

    .instance_size  = sizeof(CadenceTTCState),

    .instance_init = cadence_ttc_init,

    .class_init = cadence_ttc_class_init,

};