git: 43ac2b6d7c54 - main - Remove isab_devclass from ISA bridge drivers.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 22:42:48 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=43ac2b6d7c5459debd6c1e5dc2fa3334fc645809
commit 43ac2b6d7c5459debd6c1e5dc2fa3334fc645809
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-19 18:56:41 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:39:28 +0000
Remove isab_devclass from ISA bridge drivers.
---
sys/dev/acpica/acpi_isab.c | 2 +-
sys/dev/pci/isa_pci.c | 2 +-
sys/isa/isa_common.c | 2 --
sys/isa/isavar.h | 3 ---
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c
index 8e305f423b20..144a9e523a94 100644
--- a/sys/dev/acpica/acpi_isab.c
+++ b/sys/dev/acpica/acpi_isab.c
@@ -84,7 +84,7 @@ static driver_t acpi_isab_driver = {
sizeof(struct acpi_isab_softc),
};
-DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, isab_devclass, 0, 0);
+DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, 0, 0);
MODULE_DEPEND(acpi_isab, acpi, 1, 1, 1);
static int
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index 3c3b353806c4..9f2c33bdfac8 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/sys/dev/pci/isa_pci.c
@@ -95,7 +95,7 @@ static driver_t isab_driver = {
sizeof(struct isab_pci_softc),
};
-DRIVER_MODULE(isab, pci, isab_driver, isab_devclass, 0, 0);
+DRIVER_MODULE(isab, pci, isab_driver, 0, 0);
/*
* XXX we need to add a quirk list here for bridges that don't correctly
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 3255e76308c0..1fd3aa998ee4 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -1113,8 +1113,6 @@ MODULE_VERSION(isa, 1);
* Code common to ISA bridges.
*/
-devclass_t isab_devclass;
-
int
isab_attach(device_t dev)
{
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index c4ac81297e29..b86e64f308d9 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -165,9 +165,6 @@ ISA_ACCESSOR(pnp_csn, PNP_CSN, int)
ISA_ACCESSOR(pnp_ldn, PNP_LDN, int)
ISA_ACCESSOR(pnpbios_handle, PNPBIOS_HANDLE, int)
-/* Device class for ISA bridges. */
-extern devclass_t isab_devclass;
-
extern void isa_probe_children(device_t dev);
void isa_dmacascade(int chan);