Commit 8ce26fcd authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Peter Maydell
Browse files

hw/i2c: QOM'ify versatile_i2c.c 



Drop the old SysBus init function and use instance_init

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1465815255-21776-5-git-send-email-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 758aba7d

hw/i2c/versatile_i2c.c

+6 −13
Original line number Diff line number Diff line
@@ -79,32 +79,25 @@ static const MemoryRegionOps versatile_i2c_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static int versatile_i2c_init(SysBusDevice *sbd)

static void versatile_i2c_init(Object *obj)

{

    DeviceState *dev = DEVICE(sbd);

    VersatileI2CState *s = VERSATILE_I2C(dev);

    DeviceState *dev = DEVICE(obj);

    VersatileI2CState *s = VERSATILE_I2C(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);

    I2CBus *bus;



    bus = i2c_init_bus(dev, "i2c");

    s->bitbang = bitbang_i2c_init(bus);

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

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

                          "versatile_i2c", 0x1000);

    sysbus_init_mmio(sbd, &s->iomem);

    return 0;

}



static void versatile_i2c_class_init(ObjectClass *klass, void *data)

{

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = versatile_i2c_init;

}



static const TypeInfo versatile_i2c_info = {

    .name          = TYPE_VERSATILE_I2C,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(VersatileI2CState),

    .class_init    = versatile_i2c_class_init,

    .instance_init = versatile_i2c_init,

};



static void versatile_i2c_register_types(void)