Message ID | 20181130093852.20739-20-maozhongyi@cmss.chinamobile.com |
---|---|
State | New |
Headers | show |
Series | QOM'ify SysBusDeviceClass->init | expand |
On 30/11/18 10:38, Mao Zhongyi wrote: > Use DeviceClass rather than SysBusDeviceClass in > tusb6010_class_init(). > > Cc: kraxel@redhat.com > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/usb/tusb6010.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c > index a2128024c1..501706e2b2 100644 > --- a/hw/usb/tusb6010.c > +++ b/hw/usb/tusb6010.c > @@ -808,10 +808,10 @@ static void tusb6010_reset(DeviceState *dev) > musb_reset(s->musb); > } > > -static int tusb6010_init(SysBusDevice *sbd) > +static void tusb6010_realize(DeviceState *dev, Error **errp) > { > - DeviceState *dev = DEVICE(sbd); > TUSBState *s = TUSB(dev); > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > > s->otg_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); > s->pwr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_power_tick, s); > @@ -822,15 +822,13 @@ static int tusb6010_init(SysBusDevice *sbd) > sysbus_init_irq(sbd, &s->irq); > qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); > s->musb = musb_init(dev, 1); > - return 0; > } > > static void tusb6010_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > > - k->init = tusb6010_init; > + dc->realize = tusb6010_realize; > dc->reset = tusb6010_reset; > } > >
On Fri, Nov 30, 2018 at 05:38:50PM +0800, Mao Zhongyi wrote: > Use DeviceClass rather than SysBusDeviceClass in > tusb6010_class_init(). > > Cc: kraxel@redhat.com > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/usb/tusb6010.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c > index a2128024c1..501706e2b2 100644 > --- a/hw/usb/tusb6010.c > +++ b/hw/usb/tusb6010.c > @@ -808,10 +808,10 @@ static void tusb6010_reset(DeviceState *dev) > musb_reset(s->musb); > } > > -static int tusb6010_init(SysBusDevice *sbd) > +static void tusb6010_realize(DeviceState *dev, Error **errp) > { > - DeviceState *dev = DEVICE(sbd); > TUSBState *s = TUSB(dev); > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > > s->otg_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); > s->pwr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_power_tick, s); > @@ -822,15 +822,13 @@ static int tusb6010_init(SysBusDevice *sbd) > sysbus_init_irq(sbd, &s->irq); > qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); > s->musb = musb_init(dev, 1); > - return 0; > } > > static void tusb6010_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > > - k->init = tusb6010_init; > + dc->realize = tusb6010_realize; > dc->reset = tusb6010_reset; > } > > -- > 2.17.1 > > >
diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index a2128024c1..501706e2b2 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -808,10 +808,10 @@ static void tusb6010_reset(DeviceState *dev) musb_reset(s->musb); } -static int tusb6010_init(SysBusDevice *sbd) +static void tusb6010_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(sbd); TUSBState *s = TUSB(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); s->otg_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); s->pwr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_power_tick, s); @@ -822,15 +822,13 @@ static int tusb6010_init(SysBusDevice *sbd) sysbus_init_irq(sbd, &s->irq); qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); s->musb = musb_init(dev, 1); - return 0; } static void tusb6010_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = tusb6010_init; + dc->realize = tusb6010_realize; dc->reset = tusb6010_reset; }