From: BALATON Zoltan via <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: Huacai Chen <chenhuacai@kernel.org>, f4bug@amsat.org
Subject: [PATCH 07/12] vt82c686: Remove vt82c686b_isa_init() function
Date: Sun, 27 Dec 2020 02:10:06 +0100 [thread overview]
Message-ID: <9258083b42c06413f79cbe9340731345948db5b5.1609031406.git.balaton@eik.bme.hu> (raw)
In-Reply-To: <cover.1609031406.git.balaton@eik.bme.hu>
Also rename VT82C686B type to lower case to match other device names.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
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 758c54172b..1c1239cade 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -49,7 +49,6 @@ struct VT82C686BState {
SuperIOConfig superio_conf;
};
-#define TYPE_VT82C686B "VT82C686B"
OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B)
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);
- 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..60d2020033 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_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..89e205a1be 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 "vt82c686b"
#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
next prev parent reply other threads:[~2020-12-27 1:32 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-27 1:10 [PATCH 00/12] Misc vt82c686b clean ups BALATON Zoltan via
2020-12-27 1:10 ` [PATCH 12/12] vt82c686: Do not add floppy BALATON Zoltan via
2020-12-27 1:10 ` BALATON Zoltan via [this message]
2020-12-27 14:36 ` [PATCH 07/12] vt82c686: Remove vt82c686b_isa_init() function Philippe Mathieu-Daudé
2020-12-27 16:52 ` BALATON Zoltan via
2020-12-27 1:10 ` [PATCH 02/12] vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA BALATON Zoltan via
2020-12-27 15:04 ` Philippe Mathieu-Daudé
2020-12-27 1:10 ` [PATCH 08/12] vt82c686: Remove vt82c686b_pm_init() function BALATON Zoltan via
2020-12-27 14:39 ` Philippe Mathieu-Daudé
2020-12-27 1:10 ` [PATCH 01/12] vt82c686: Add APM and ACPI dependencies for VT82C686 BALATON Zoltan via
2020-12-28 0:35 ` Huacai Chen
2020-12-28 1:41 ` BALATON Zoltan via
2020-12-28 2:03 ` chen huacai
2020-12-27 1:10 ` [PATCH 06/12] audio/via-ac97: Simplify code and set user_creatable to false BALATON Zoltan via
2020-12-27 14:56 ` Philippe Mathieu-Daudé
2020-12-27 16:47 ` BALATON Zoltan via
2020-12-27 1:10 ` [PATCH 04/12] vt82c686: Remove vt82c686b_[am]c97_init() functions BALATON Zoltan via
2021-01-01 21:07 ` Philippe Mathieu-Daudé
2020-12-27 1:10 ` [PATCH 03/12] vt82c686: Remove unnecessary _DEVICE suffix from type macros BALATON Zoltan via
2020-12-27 14:29 ` Philippe Mathieu-Daudé
2020-12-27 14:33 ` Philippe Mathieu-Daudé
2020-12-27 16:49 ` BALATON Zoltan via
2020-12-27 1:10 ` [PATCH 11/12] vt82c686: Rename some functions to better show where they belong BALATON Zoltan via
2020-12-27 14:25 ` Philippe Mathieu-Daudé
2020-12-27 1:10 ` [PATCH 10/12] vt82c686: Remove unneeded includes and defines BALATON Zoltan via
2020-12-27 14:51 ` Philippe Mathieu-Daudé
2020-12-27 1:10 ` [PATCH 05/12] vt82c686: Split off via-[am]c97 into separate file in hw/audio BALATON Zoltan via
2020-12-27 15:03 ` Philippe Mathieu-Daudé
2020-12-27 1:10 ` [PATCH 09/12] vt82c686: Convert debug printf to trace points BALATON Zoltan via
2020-12-27 15:08 ` Philippe Mathieu-Daudé
2020-12-27 16:42 ` BALATON Zoltan via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9258083b42c06413f79cbe9340731345948db5b5.1609031406.git.balaton@eik.bme.hu \
--to=qemu-devel@nongnu.org \
--cc=balaton@eik.bme.hu \
--cc=chenhuacai@kernel.org \
--cc=f4bug@amsat.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.