From nobody Tue Nov 18 10:37:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707074; cv=none; d=zohomail.com; s=zohoarc; b=B5HG0y0/CIjeG49z60frNF/+zQJDcCvy5RgTk/ASM2VKTNkfDhN5ThbFJwpbQbsckL9QFm329EvL+htMe2LU9oiOa22FRYVoU1CXVuYFdsiE4TczJ3WhN1/mkVZUSoiaD7W1f+OA0cmcmPgi6VwpWm3400nzyeCxdr9vAPfo4aM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707074; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nOzZTcac2kllEQZs0BxsVCpPfK/RYn4dnLOEe0pRhUU=; b=b9T+Z/QLHP3siJVuzgCv4yobhmfN0+qJ+0BGCUMCqwYKmcSIksHcljweQUG9ke1pJT9U7oymEC9af8I49Rpa2Ckr+SaFqbQWX3qVqkIXYgeqWBv1WwzJNcBMKZkvKpC+ezfynD3IX1tAU5GjJkmZQiZySoXqgjllrf+tV5353vY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1609707074169995.7536951536315; Sun, 3 Jan 2021 12:51:14 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id a6so15940796wmc.2 for ; Sun, 03 Jan 2021 12:51:13 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id b13sm84101630wrt.31.2021.01.03.12.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nOzZTcac2kllEQZs0BxsVCpPfK/RYn4dnLOEe0pRhUU=; b=JdRLgVF9+4WGYfgUPblH9CF7aCD8k2deznbeYHdfqemdHTxcTVPjnQwo6UY8UUZClL ugtNlUtT99WZTJG7qpe0zUGp7l7fLk1vATcSmyngj5GEjaMsvQzNUwQ8F4hDx+ggW0v9 qGZED3/BRkiOPcJwpDOBPAlLbuo154mLCoEFuRloro6/f+jxNSZGllW3zwaJ1+ekZG56 mVawOB13qld7ctQR/eDDZgViyTHnGOSzsehnKvfTj3r4/tt1Xqx+x6K9qjo6Z+CSy19T 6T8jOUO7xX0JIW4uFO2mwWv+GEd83swTy4Oip19z6uUCN6AwfGakwqkOXiwv9fZwnnye gScQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nOzZTcac2kllEQZs0BxsVCpPfK/RYn4dnLOEe0pRhUU=; b=KWtPfErjZvW8GYB7hSSLDCULEAtDJzngvZZ3SZGG/aF7VPIOexsw/dVwtjNp5OWc60 dO5frAVn+jMGAVz9tMcMWu8LG/6onFdG19OIUJmtZvmkZSPu7W32yu0LaFdlOZ619gSo Dx8MEkuepNXW4mCtjsbPNKDzGKrNO7kf0W66UjO7ZXXTkNxLW04AsKQ9oJuAqyGD10hB 1EoZi1eZ7JXz5PvI7wZEcNl4mHzk+9Qff0kpnpwbSPmWOiRB07USKsp8yyGXbGphPeTY qnfvZJCcJFbISvHfm5i7XhQrh+PutgsBJlJSaPMQ2BDIG2NIti0efvMtZx/CbcJtzVMD tbMg== X-Gm-Message-State: AOAM531kjgNy9zOdsgx6JMtEB1avoVMytdAjC6OoZScQEFE+e/lTAXlY P5WwUon2MrUQ/5xlmMCZWC8= X-Google-Smtp-Source: ABdhPJy9l+76skRYYb7/m/4rlZBMUTU2PYbqCFQFEOAuSLOQzr97MSD5fzCDNsIbapyN4LiWYvHh2A== X-Received: by 2002:a1c:1dd4:: with SMTP id d203mr24495300wmd.118.1609707072406; Sun, 03 Jan 2021 12:51:12 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/35] vt82c686: Remove vt82c686b_[am]c97_init() functions Date: Sun, 3 Jan 2021 21:49:56 +0100 Message-Id: <20210103205021.2837760-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan These are legacy init functions that are just equivalent to directly calling pci_create_simple so do that instead. Also rename objects to lower case via-ac97 and via-mc97 matching naming of other devices. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <1c4373c8aeb6c4fb2a8df2c864b0e91a977a3d7b.1609584216.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/vt82c686.h | 4 ++-- hw/isa/vt82c686.c | 27 ++++----------------------- hw/mips/fuloong2e.c | 4 ++-- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index f23f45dfb1d..ff80a926dcb 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -3,11 +3,11 @@ =20 =20 #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" +#define TYPE_VIA_AC97 "via-ac97" +#define TYPE_VIA_MC97 "via-mc97" =20 /* vt82c686.c */ ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn); -void vt82c686b_ac97_init(PCIBus *bus, int devfn); -void vt82c686b_mc97_init(PCIBus *bus, int devfn); I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq); =20 diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index d40599c7daa..8677a2d212b 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -179,12 +179,6 @@ struct VIAMC97State { #define TYPE_VT82C686B_PM "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) =20 -#define TYPE_VIA_MC97 "VIA_MC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) - -#define TYPE_VIA_AC97 "VIA_AC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) - static void pm_update_sci(VT686PMState *s) { int sci_level, pmsts; @@ -254,10 +248,13 @@ static const VMStateDescription vmstate_acpi =3D { }; =20 /* - * TODO: vt82c686b_ac97_init() and vt82c686b_mc97_init() + * TODO: VIA_AC97 and VIA_MC97 * just register a PCI device now, functionalities will be implemented lat= er. */ =20 +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) + static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp) { VIAAC97State *s =3D VIA_AC97(dev); @@ -270,14 +267,6 @@ static void vt82c686b_ac97_realize(PCIDevice *dev, Err= or **errp) pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); } =20 -void vt82c686b_ac97_init(PCIBus *bus, int devfn) -{ - PCIDevice *dev; - - dev =3D pci_new(devfn, TYPE_VIA_AC97); - pci_realize_and_unref(dev, bus, &error_fatal); -} - static void via_ac97_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -314,14 +303,6 @@ static void vt82c686b_mc97_realize(PCIDevice *dev, Err= or **errp) pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); } =20 -void vt82c686b_mc97_init(PCIBus *bus, int devfn) -{ - PCIDevice *dev; - - dev =3D pci_new(devfn, TYPE_VIA_MC97); - pci_realize_and_unref(dev, bus, &error_fatal); -} - static void via_mc97_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 45c596f4fe5..8287e65c52c 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -262,8 +262,8 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, *i2c_bus =3D vt82c686b_pm_init(pci_bus, PCI_DEVFN(slot, 4), 0xeee1, NU= LL); =20 /* Audio support */ - vt82c686b_ac97_init(pci_bus, PCI_DEVFN(slot, 5)); - vt82c686b_mc97_init(pci_bus, PCI_DEVFN(slot, 6)); + pci_create_simple(pci_bus, PCI_DEVFN(slot, 5), TYPE_VIA_AC97); + pci_create_simple(pci_bus, PCI_DEVFN(slot, 6), TYPE_VIA_MC97); } =20 /* Network support */ --=20 2.26.2