On Mon, Nov 19, 2018 at 4:28 AM Mao Zhongyi
<maozhon...@cmss.chinamobile.com> wrote:
>
> Use DeviceClass rather than SysBusDeviceClass in
> g364fb_sysbus_class_init().
>
> Cc: pbonz...@redhat.com
> Cc: kra...@redhat.com
> Cc: f4...@amsat.org
> Cc: alistair.fran...@wdc.com
>
> Signed-off-by: Mao Zhongyi <maozhon...@cmss.chinamobile.com>
> Signed-off-by: Zhang Shengju <zhangshen...@cmss.chinamobile.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/display/g364fb.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
> index 8ad7e5d824..e7f67088b0 100644
> --- a/hw/display/g364fb.c
> +++ b/hw/display/g364fb.c
> @@ -489,18 +489,15 @@ typedef struct {
> G364State g364;
> } G364SysBusState;
>
> -static int g364fb_sysbus_init(SysBusDevice *sbd)
> +static void g364fb_sysbus_realize(DeviceState *dev, Error **errp)
> {
> - DeviceState *dev = DEVICE(sbd);
> G364SysBusState *sbs = G364(dev);
> G364State *s = &sbs->g364;
>
> g364fb_init(dev, s);
> - sysbus_init_irq(sbd, &s->irq);
> - sysbus_init_mmio(sbd, &s->mem_ctrl);
> - sysbus_init_mmio(sbd, &s->mem_vram);
> -
> - return 0;
> + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq);
> + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mem_ctrl);
> + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mem_vram);
> }
>
> static void g364fb_sysbus_reset(DeviceState *d)
> @@ -518,9 +515,8 @@ static Property g364fb_sysbus_properties[] = {
> static void g364fb_sysbus_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = g364fb_sysbus_init;
> + dc->realize = g364fb_sysbus_realize;
> set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
> dc->desc = "G364 framebuffer";
> dc->reset = g364fb_sysbus_reset;
> --
> 2.17.1
>
>
>
>
