git: 09fd3b43ad11 - main - Remove isa_devclass from ISA bus drivers.

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=09fd3b43ad1156d157bc5bd6df270905a82b6094

commit 09fd3b43ad1156d157bc5bd6df270905a82b6094
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-19 18:58:35 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:39:28 +0000

    Remove isa_devclass from ISA bus drivers.
---
 sys/dev/viapm/viapm.c | 4 ++--
 sys/isa/isa_common.c  | 6 ++----
 sys/isa/isa_common.h  | 1 -
 sys/x86/isa/isa.c     | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys/dev/viapm/viapm.c b/sys/dev/viapm/viapm.c
index eda776e90f1c..4f3016eddc21 100644
--- a/sys/dev/viapm/viapm.c
+++ b/sys/dev/viapm/viapm.c
@@ -1015,8 +1015,8 @@ MODULE_DEPEND(viapropm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(viapm, 1);
 
 #ifdef DEV_ISA
-DRIVER_MODULE(isa, viapm, isa_driver, isa_devclass, 0, 0);
-DRIVER_MODULE(isa, viapropm, isa_driver, isa_devclass, 0, 0);
+DRIVER_MODULE(isa, viapm, isa_driver, 0, 0);
+DRIVER_MODULE(isa, viapropm, isa_driver, 0, 0);
 MODULE_DEPEND(viapm, isa, 1, 1, 1);
 MODULE_DEPEND(viapropm, isa, 1, 1, 1);
 #endif
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 1fd3aa998ee4..ec3d01d547ed 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -1099,14 +1099,12 @@ static device_method_t isa_methods[] = {
 
 DEFINE_CLASS_0(isa, isa_driver, isa_methods, 0);
 
-devclass_t isa_devclass;
-
 /*
  * ISA can be attached to a PCI-ISA bridge, or other locations on some
  * platforms.
  */
-DRIVER_MODULE(isa, isab, isa_driver, isa_devclass, 0, 0);
-DRIVER_MODULE(isa, eisab, isa_driver, isa_devclass, 0, 0);
+DRIVER_MODULE(isa, isab, isa_driver, 0, 0);
+DRIVER_MODULE(isa, eisab, isa_driver, 0, 0);
 MODULE_VERSION(isa, 1);
 
 /*
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 8bffbd8fea28..16113fb85a86 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -77,4 +77,3 @@ extern int isa_release_resource(device_t bus, device_t child,
     int type, int rid, struct resource *r);
 
 extern driver_t isa_driver;
-extern devclass_t isa_devclass;
diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c
index 49402b44ffba..33722ca1f748 100644
--- a/sys/x86/isa/isa.c
+++ b/sys/x86/isa/isa.c
@@ -144,9 +144,9 @@ isa_release_resource(device_t bus, device_t child, int type, int rid,
 /*
  * On this platform, isa can also attach to the legacy bus.
  */
-DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0);
+DRIVER_MODULE(isa, legacy, isa_driver, 0, 0);
 
 /*
  * Attach the ISA bus to the xenpv bus in order to get syscons.
  */
-DRIVER_MODULE(isa, xenpv, isa_driver, isa_devclass, 0, 0);
+DRIVER_MODULE(isa, xenpv, isa_driver, 0, 0);