Commit 16fb31a3 authored by xiaoqiang.zhao's avatar xiaoqiang.zhao Committed by Peter Maydell
Browse files

hw/arm: QOM'ify pxa2xx.c 



Drop the use of old SysBus init function and use instance_init

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a1f42e0c

hw/arm/pxa2xx.c

+11 −15
Original line number Diff line number Diff line
@@ -1107,9 +1107,10 @@ static const MemoryRegionOps pxa2xx_rtc_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static int pxa2xx_rtc_init(SysBusDevice *dev)

static void pxa2xx_rtc_init(Object *obj)

{

    PXA2xxRTCState *s = PXA2XX_RTC(dev);

    PXA2xxRTCState *s = PXA2XX_RTC(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);

    struct tm tm;

    int wom;
@@ -1138,11 +1139,9 @@ static int pxa2xx_rtc_init(SysBusDevice *dev) 


    sysbus_init_irq(dev, &s->rtc_irq);



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

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

                          "pxa2xx-rtc", 0x10000);

    sysbus_init_mmio(dev, &s->iomem);



    return 0;

}



static void pxa2xx_rtc_pre_save(void *opaque)
@@ -1195,9 +1194,7 @@ static const VMStateDescription vmstate_pxa2xx_rtc_regs = { 
static void pxa2xx_rtc_sysbus_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = pxa2xx_rtc_init;

    dc->desc = "PXA2xx RTC Controller";

    dc->vmsd = &vmstate_pxa2xx_rtc_regs;

}
@@ -1206,6 +1203,7 @@ static const TypeInfo pxa2xx_rtc_sysbus_info = { 
    .name          = TYPE_PXA2XX_RTC,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(PXA2xxRTCState),

    .instance_init = pxa2xx_rtc_init,

    .class_init    = pxa2xx_rtc_sysbus_class_init,

};
@@ -1501,19 +1499,18 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, 
    return s;

}



static int pxa2xx_i2c_initfn(SysBusDevice *sbd)

static void pxa2xx_i2c_initfn(Object *obj)

{

    DeviceState *dev = DEVICE(sbd);

    PXA2xxI2CState *s = PXA2XX_I2C(dev);

    DeviceState *dev = DEVICE(obj);

    PXA2xxI2CState *s = PXA2XX_I2C(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    s->bus = i2c_init_bus(dev, "i2c");



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

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

                          "pxa2xx-i2c", s->region_size);

    sysbus_init_mmio(sbd, &s->iomem);

    sysbus_init_irq(sbd, &s->irq);



    return 0;

}



I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s)
@@ -1530,9 +1527,7 @@ static Property pxa2xx_i2c_properties[] = { 
static void pxa2xx_i2c_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = pxa2xx_i2c_initfn;

    dc->desc = "PXA2xx I2C Bus Controller";

    dc->vmsd = &vmstate_pxa2xx_i2c;

    dc->props = pxa2xx_i2c_properties;
@@ -1542,6 +1537,7 @@ static const TypeInfo pxa2xx_i2c_info = { 
    .name          = TYPE_PXA2XX_I2C,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(PXA2xxI2CState),

    .instance_init = pxa2xx_i2c_initfn,

    .class_init    = pxa2xx_i2c_class_init,

};