Message ID | 20231019130925.18744-5-philmd@linaro.org |
---|---|
State | New |
Headers | show |
Series | hw/arm/pxa2xx: SysBus/QDev fixes | expand |
On 19/10/2023 15.09, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/pcmcia/pxa2xx.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c > index e7264feb45..a2ab96d749 100644 > --- a/hw/pcmcia/pxa2xx.c > +++ b/hw/pcmcia/pxa2xx.c > @@ -141,13 +141,7 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level) > PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, > hwaddr base) > { > - DeviceState *dev; > - > - dev = qdev_new(TYPE_PXA2XX_PCMCIA); > - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); > - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); > - > - return PXA2XX_PCMCIA(dev); > + return PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, base, NULL)); > } I'd maybe prefer dev = sysbus_create_simple(TYPE_PXA2XX_PCMCIA, base, NULL); return PXA2XX_PCMCIA(dev); for readability, but that's just a matter of taste, so: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index e7264feb45..a2ab96d749 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -141,13 +141,7 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level) PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, hwaddr base) { - DeviceState *dev; - - dev = qdev_new(TYPE_PXA2XX_PCMCIA); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - - return PXA2XX_PCMCIA(dev); + return PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, base, NULL)); } static void pxa2xx_pcmcia_initfn(Object *obj)
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/pcmcia/pxa2xx.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)