On 19/10/2023 15.09, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> include/hw/arm/pxa.h | 2 --
> hw/arm/pxa2xx.c | 12 ++++++++----
> hw/pcmcia/pxa2xx.c | 6 ------
> 3 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
> index 54eb895e42..4c6caee113 100644
> --- a/include/hw/arm/pxa.h
> +++ b/include/hw/arm/pxa.h
> @@ -100,8 +100,6 @@ void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq readonly,
> #define TYPE_PXA2XX_PCMCIA "pxa2xx-pcmcia"
> OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxPCMCIAState, PXA2XX_PCMCIA)
>
> -PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem,
> - hwaddr base);
> int pxa2xx_pcmcia_attach(void *opaque, PCMCIACardState *card);
> int pxa2xx_pcmcia_detach(void *opaque);
> void pxa2xx_pcmcia_set_irq_cb(void *opaque, qemu_irq irq, qemu_irq cd_irq);
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index 07d5dd8691..601ddd8766 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -2205,8 +2205,10 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *cpu_type)
> sysbus_create_simple("sysbus-ohci", 0x4c000000,
> qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));
>
> - s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000);
> - s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000);
> + s->pcmcia[0] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA,
> + 0x20000000, NULL));
> + s->pcmcia[1] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA,
> + 0x30000000, NULL));
>
> sysbus_create_simple(TYPE_PXA2XX_RTC, 0x40900000,
> qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM));
> @@ -2338,8 +2340,10 @@ PXA2xxState *pxa255_init(unsigned int sdram_size)
> s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");
> }
>
> - s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000);
> - s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000);
> + s->pcmcia[0] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA,
> + 0x20000000, NULL));
> + s->pcmcia[1] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA,
> + 0x30000000, NULL));
>
> sysbus_create_simple(TYPE_PXA2XX_RTC, 0x40900000,
> qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM));
> diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c
> index a2ab96d749..e3111fdf1a 100644
> --- a/hw/pcmcia/pxa2xx.c
> +++ b/hw/pcmcia/pxa2xx.c
> @@ -138,12 +138,6 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level)
> qemu_set_irq(s->irq, level);
> }
>
> -PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem,
> - hwaddr base)
> -{
> - return PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, base, NULL));
> -}
Ok, it's removed here anyway, so never mind my comment for the previous
patch :-)
Reviewed-by: Thomas Huth <thuth@redhat.com>