[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/10] vt82c686: Remove legacy vt82c686b_isa_init() function
From: |
BALATON Zoltan |
Subject: |
[PATCH v2 07/10] vt82c686: Remove legacy vt82c686b_isa_init() function |
Date: |
Mon, 28 Dec 2020 03:08:13 +0100 |
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v2: Reworded commit message
hw/isa/vt82c686.c | 9 ---------
hw/mips/fuloong2e.c | 4 +++-
include/hw/isa/vt82c686.h | 3 +--
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 9567326d8e..2912c253dc 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -49,7 +49,6 @@ struct VT82C686BISAState {
SuperIOConfig superio_conf;
};
-#define TYPE_VT82C686B_ISA "vt82c686b-isa"
OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)
static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data,
@@ -367,14 +366,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)
&vt82c->superio);
}
-ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn)
-{
- PCIDevice *d;
-
- d = pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B_ISA);
- return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0"));
-}
-
static void via_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 3b0489f781..d123e34d9e 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -240,7 +240,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int
slot, qemu_irq intc,
ISABus *isa_bus;
PCIDevice *dev;
- isa_bus = vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0));
+ dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true,
+ TYPE_VT82C686B_ISA);
+ isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(dev), "isa.0"));
assert(isa_bus);
*p_isa_bus = isa_bus;
/* Interrupt controller */
diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h
index ff80a926dc..8d2d276fe1 100644
--- a/include/hw/isa/vt82c686.h
+++ b/include/hw/isa/vt82c686.h
@@ -1,13 +1,12 @@
#ifndef HW_VT82C686_H
#define HW_VT82C686_H
-
+#define TYPE_VT82C686B_ISA "vt82c686b-isa"
#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"
#define TYPE_VIA_AC97 "via-ac97"
#define TYPE_VIA_MC97 "via-mc97"
/* vt82c686.c */
-ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn);
I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq);
--
2.21.3
- [PATCH v2 00/10] Misc vt82c686b clean ups, BALATON Zoltan, 2020/12/27
- [PATCH v2 01/10] vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA, BALATON Zoltan, 2020/12/27
- [PATCH v2 04/10] vt82c686: Remove vt82c686b_[am]c97_init() functions, BALATON Zoltan, 2020/12/27
- [PATCH v2 03/10] vt82c686b: Rename VT82C686B to VT82C686B_ISA, BALATON Zoltan, 2020/12/27
- [PATCH v2 02/10] vt82c686: Remove unnecessary _DEVICE suffix from type macros, BALATON Zoltan, 2020/12/27
- [PATCH v2 07/10] vt82c686: Remove legacy vt82c686b_isa_init() function,
BALATON Zoltan <=
- [PATCH v2 10/10] vt82c686: Remove unneeded includes and defines, BALATON Zoltan, 2020/12/27
- [PATCH v2 08/10] vt82c686: Remove legacy vt82c686b_pm_init() function, BALATON Zoltan, 2020/12/27
- [PATCH v2 05/10] vt82c686: Split off via-[am]c97 into separate file in hw/audio, BALATON Zoltan, 2020/12/27
- [PATCH v2 06/10] audio/via-ac97: Simplify code and set user_creatable to false, BALATON Zoltan, 2020/12/27
- [PATCH v2 09/10] vt82c686: Convert debug printf to trace points, BALATON Zoltan, 2020/12/27