git: 1c1e88367c76 - main - atkbd/psm: Remove unused devclass arguments to DRIVER_MODULE.

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=1c1e88367c76469ffbb806a40272bdd3fd1ac3bc

commit 1c1e88367c76469ffbb806a40272bdd3fd1ac3bc
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-06 22:46:58 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:46:58 +0000

    atkbd/psm: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/dev/atkbdc/atkbd_atkbdc.c | 4 +---
 sys/dev/atkbdc/atkbdc_isa.c   | 4 ++--
 sys/dev/atkbdc/atkbdc_subr.c  | 2 --
 sys/dev/atkbdc/atkbdc_subr.h  | 2 --
 sys/dev/atkbdc/psm.c          | 9 +++------
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index 9513e238f153..7acc2244cad8 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -52,8 +52,6 @@ typedef struct {
 	void		*ih;
 } atkbd_softc_t;
 
-static devclass_t	atkbd_devclass;
-
 static void	atkbdidentify(driver_t *driver, device_t dev);
 static int	atkbdprobe(device_t dev);
 static int	atkbdattach(device_t dev);
@@ -171,7 +169,7 @@ atkbdintr(void *arg)
 	kbdd_intr(kbd, NULL);
 }
 
-DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0);
+DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, 0, 0);
 #ifdef EVDEV_SUPPORT
 MODULE_DEPEND(atkbd, evdev, 1, 1, 1);
 #endif
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index c882403d89ab..75d2850dbcd7 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -319,6 +319,6 @@ atkbdc_isa_release_resource(device_t dev, device_t child, int type, int rid,
 	return (bus_generic_rl_release_resource(dev, child, type, rid, r));
 }
 
-DRIVER_MODULE(atkbdc, isa, atkbdc_isa_driver, atkbdc_devclass, 0, 0);
-DRIVER_MODULE(atkbdc, acpi, atkbdc_isa_driver, atkbdc_devclass, 0, 0);
+DRIVER_MODULE(atkbdc, isa, atkbdc_isa_driver, 0, 0);
+DRIVER_MODULE(atkbdc, acpi, atkbdc_isa_driver, 0, 0);
 ISA_PNP_INFO(atkbdc_ids);
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 8ac80d95258d..dc9d2d5cd812 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
 
 MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device");
 
-devclass_t atkbdc_devclass;
-
 int
 atkbdc_print_child(device_t bus, device_t dev)
 {
diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h
index 54e40f4b839a..8d0aee26031d 100644
--- a/sys/dev/atkbdc/atkbdc_subr.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -34,8 +34,6 @@
 
 MALLOC_DECLARE(M_ATKBDDEV);
 
-extern devclass_t atkbdc_devclass;
-
 /* children */
 typedef struct atkbdc_device {
 	struct resource_list resources;
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index ed0f78bb3839..b3e036ebc134 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -476,7 +476,6 @@ struct psm_softc {		/* Driver status information */
 	struct evdev_dev *evdev_r;	/* Relative reporting device */
 #endif
 };
-static devclass_t psm_devclass;
 
 /* driver state flags (state) */
 #define	PSM_VALID		0x80
@@ -7438,7 +7437,7 @@ psmresume(device_t dev)
 	return (err);
 }
 
-DRIVER_MODULE(psm, atkbdc, psm_driver, psm_devclass, 0, 0);
+DRIVER_MODULE(psm, atkbdc, psm_driver, 0, 0);
 #ifdef EVDEV_SUPPORT
 MODULE_DEPEND(psm, evdev, 1, 1, 1);
 #endif
@@ -7459,8 +7458,6 @@ MODULE_DEPEND(psm, evdev, 1, 1, 1);
  * under the keyboard controller, then probe and attach it.
  */
 
-static	devclass_t			psmcpnp_devclass;
-
 static	device_probe_t			psmcpnp_probe;
 static	device_attach_t			psmcpnp_attach;
 
@@ -7619,7 +7616,7 @@ psmcpnp_attach(device_t dev)
 	return (0);
 }
 
-DRIVER_MODULE(psmcpnp, isa, psmcpnp_driver, psmcpnp_devclass, 0, 0);
-DRIVER_MODULE(psmcpnp, acpi, psmcpnp_driver, psmcpnp_devclass, 0, 0);
+DRIVER_MODULE(psmcpnp, isa, psmcpnp_driver, 0, 0);
+DRIVER_MODULE(psmcpnp, acpi, psmcpnp_driver, 0, 0);
 ISA_PNP_INFO(psmcpnp_ids);
 #endif /* DEV_ISA */