From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70700CDB465 for ; Thu, 19 Oct 2023 16:10:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtVav-0001CU-D2; Thu, 19 Oct 2023 12:09:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtVat-0001AR-89 for qemu-devel@nongnu.org; Thu, 19 Oct 2023 12:09:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtVar-0005M0-Q9 for qemu-devel@nongnu.org; Thu, 19 Oct 2023 12:09:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697731793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=NjaasQW3JiDqaXOVvkypF9OWN0A56wWIbiCLnyWB3YU=; b=EkQAwL6STSQ1QezYok4mWs2P9vHxSpTBxZvxpX1oUGZD3bfEHRCct7R3NhSzpHYMI7m3M6 xZYlp+hqBbHeTLdBqf6RV5i0oPIHt3PPTsNcUpl96Of3+EVvEXySovQSHmwt5AXM3wdeAB 3UnmUcvyyoOQqt+bsdKqEpGZJQCFDAI= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-YxUrWjOZP5iujh9eEYlkYw-1; Thu, 19 Oct 2023 12:09:35 -0400 X-MC-Unique: YxUrWjOZP5iujh9eEYlkYw-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-41cb7904d5aso27131961cf.0 for ; Thu, 19 Oct 2023 09:09:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697731775; x=1698336575; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NjaasQW3JiDqaXOVvkypF9OWN0A56wWIbiCLnyWB3YU=; b=q+T6LPjqt5oBkg/ZxI6mmbcT4bXNTPuNz9Q0NZ2EvUNA4GnwEImC1wO9rQiSR+mUvZ RE+6rIGbAFx56kdkq465najaFa+5G+SkYNOWXN6ulLwj6k0QghRv84BGEhKEcG6lFSXV 8udfjTIbvZb5eIDMwW88FYluhYaTDlEJy5+gi3NmH+0+5gc4gpeq0u5Q4rM1K7NILRFu wYXKKReTalnbGda3h7dE+SFpTwd32A0wx5JnGBNiqAF9VsrIGsrVl/6dddfDrI9x7UNI 5FxngiAMxMqMP4vfXocW79OX4tE1MWyDn6+Sd2LeGz0xnq8L51l/UYEuEfZyClNzXyJO Ahtg== X-Gm-Message-State: AOJu0Yz0zk0aRFhTGhXAkd61xuLVu7DfSdh6CiWgeHjF2/e+BjQIMRzC OyI83maZgLCfBLo79rBYk+TAUcbZ80KG8ko1Tn1NQ59u2mA1qNFlrSrgPF9ERaZK35T3dwDMtPl 99Yx7FEIH82mopys= X-Received: by 2002:ac8:7f42:0:b0:40c:58a1:cb40 with SMTP id g2-20020ac87f42000000b0040c58a1cb40mr3291450qtk.15.1697731775269; Thu, 19 Oct 2023 09:09:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdUWDFmqBtjAa6xFMiHVVlrIi3vyve/7zC3cH8xaUUoikfRy5J1RUl+GwGS/I6H7aaQvI5xg== X-Received: by 2002:ac8:7f42:0:b0:40c:58a1:cb40 with SMTP id g2-20020ac87f42000000b0040c58a1cb40mr3291419qtk.15.1697731774934; Thu, 19 Oct 2023 09:09:34 -0700 (PDT) Received: from [192.168.0.5] (ip-109-43-176-141.web.vodafone.de. [109.43.176.141]) by smtp.gmail.com with ESMTPSA id k17-20020ac86051000000b004181b41e793sm830025qtm.50.2023.10.19.09.09.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Oct 2023 09:09:34 -0700 (PDT) Message-ID: <4e1f24fe-2567-4a07-b919-a252a538c6c7@redhat.com> Date: Thu, 19 Oct 2023 18:09:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 5/9] hw/pcmcia/pxa2xx: Inline pxa2xx_pcmcia_init() Content-Language: en-US To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org References: <20231019130925.18744-1-philmd@linaro.org> <20231019130925.18744-6-philmd@linaro.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20231019130925.18744-6-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 19/10/2023 15.09, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé > --- > 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