From nobody Tue Nov 18 10:37:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609707093; cv=none; d=zohomail.com; s=zohoarc; b=nUDL9WX0XRb+/TWhqVUAkfMupXOINiIrbjQeilKQLwJtjuH64e5UquAMGfWD3PTCzppW3BomvQVMakMLfG0WcVKZxVIB6rWAYkJXSUpb8kO+C41TpXsViD8FqQKm0aM9hhuYUBDk6huNu+I5qTt48gRs8bU+UbGrcFOpS5Z1uFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707093; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hJrzfFBwJziaAyqYy93hx4DlRm1EQlMzThmIeVx9X0A=; b=bFULh1gddXO2IRdDVRsCkgsOVn+oVwXn7daTfWkwS437MpMBcD5ywhY4k6Gml4VfP7gG1Lfh56N89shmrVGk5W6Yi/bnQV26uj1SsS0lvyNxjLCfmEdvvflwSLKZ0flq43HkPevoeX4Oa5NAme+f9JZNyRvMMprIiXlkmB1DYIQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1609707092992914.1502281668451; Sun, 3 Jan 2021 12:51:32 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id c5so29458635wrp.6 for ; Sun, 03 Jan 2021 12:51:32 -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 m11sm29066988wmi.16.2021.01.03.12.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:30 -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=hJrzfFBwJziaAyqYy93hx4DlRm1EQlMzThmIeVx9X0A=; b=LEzfXUC45FMtcebYOuVRq1Jo+R8lhf0lw5pJWEwu/C4tCpX54p9IXTzNHo+//IgN6y 3p5LI2TSpuUl6Gf5vrLuKkwzUaGXKK8ACKVFGnKlD3fwPLhZpYRb/c1A1/NozwsFg9M8 AnEWS014d+ImLTuIRDScDIZw8hFqZGxV7AmzT3ko2tdC8fMcAeBkj659emHCWEqM2ftw aHkPhINmH89weeOQmR762qc6Ym/7syxnzE/j/4t4ZDyRwglHjGbvOVAr4h69S3nV91X/ WUr9b7D78bP9reIhvCdtIdjmF4knd0d/tyhsaH4Ij9L28W8xSY/IJYV9MH6elqirfF5X KjvQ== 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=hJrzfFBwJziaAyqYy93hx4DlRm1EQlMzThmIeVx9X0A=; b=objXVWxI3VdXt3xuH6MXydM+kB032oanEYcs11h8MUfxiNB/oD1RBwEHTEozXvPEUA asFUEwotAdhgD9r7EeQ9Aa9T1ZeXqkf4/ZTJ5ZuAMm/3fW2yyt4pOsSMQszVNYVJ4ntJ UWZ87pmweL8SfC8Qbu5NR2IeDT84WaerLxOSRUb937J1O8cgLFPukZz4UoCYVqFzEZC0 TJQdt8EMJ9rxi2XLEigXAdWk2SR5LTpVwpPZhyuhV5AiJeTW1v+WA+GYuS3TJrwFp7HM YddKXOmgbJcTHdYevg94YPlLlRG75x5x2L7cF+r52qF0TG8qdnfJ6GcgaKSRgdnsmQzi 2yqA== X-Gm-Message-State: AOAM531PNX9pdmjwPYC+lv8gvj+jEbKg8JeOnxejsjeZJC4CG28CfXV4 r7W8rhpFVXTw7FwG22VqOPc= X-Google-Smtp-Source: ABdhPJzVnmfMY/Mea1XJxIY4fh7AmOBVbzlb1i6AM9tyMm6ujJCTTdmrQoeO2VjVRxXHcAc+jbLzuA== X-Received: by 2002:adf:f58a:: with SMTP id f10mr80219954wro.338.1609707091258; Sun, 03 Jan 2021 12:51:31 -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 14/35] vt82c686: Remove legacy vt82c686b_pm_init() function Date: Sun, 3 Jan 2021 21:50:00 +0100 Message-Id: <20210103205021.2837760-15-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 Remove legacy vt82c686b_pm_init() function and also rename VT82C686B_PM type name to match other device names. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/vt82c686.h | 5 +---- hw/isa/vt82c686.c | 18 ------------------ hw/mips/fuloong2e.c | 5 ++++- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 8d2d276fe16..5b0a1ffe725 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -3,11 +3,8 @@ =20 #define TYPE_VT82C686B_ISA "vt82c686b-isa" #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" +#define TYPE_VT82C686B_PM "vt82c686b-pm" #define TYPE_VIA_AC97 "via-ac97" #define TYPE_VIA_MC97 "via-mc97" =20 -/* vt82c686.c */ -I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq); - #endif diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 2912c253dca..cd87ec01039 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -12,7 +12,6 @@ =20 #include "qemu/osdep.h" #include "hw/isa/vt82c686.h" -#include "hw/i2c/i2c.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "hw/isa/isa.h" @@ -167,7 +166,6 @@ struct VT686PMState { uint32_t smb_io_base; }; =20 -#define TYPE_VT82C686B_PM "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) =20 static void pm_update_sci(VT686PMState *s) @@ -271,22 +269,6 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error= **errp) acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2); } =20 -I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq) -{ - PCIDevice *dev; - VT686PMState *s; - - dev =3D pci_new(devfn, TYPE_VT82C686B_PM); - qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); - - s =3D VT82C686B_PM(dev); - - pci_realize_and_unref(dev, bus, &error_fatal); - - return s->smb.smbus; -} - static Property via_pm_properties[] =3D { DEFINE_PROP_UINT32("smb_io_base", VT686PMState, smb_io_base, 0), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 435f0e5be5b..e5d08669069 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -261,7 +261,10 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus= , int slot, qemu_irq intc, pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); =20 - *i2c_bus =3D vt82c686b_pm_init(pci_bus, PCI_DEVFN(slot, 4), 0xeee1, NU= LL); + dev =3D pci_new(PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM); + qdev_prop_set_uint32(DEVICE(dev), "smb_io_base", 0xeee1); + pci_realize_and_unref(dev, pci_bus, &error_fatal); + *i2c_bus =3D I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); =20 /* Audio support */ pci_create_simple(pci_bus, PCI_DEVFN(slot, 5), TYPE_VIA_AC97); --=20 2.26.2