git: 6d5880906ecc - main - ppbus/ppc: Remove unused devclass arguments to DRIVER_MODULE.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Fri, 06 May 2022 23:24:40 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=6d5880906ecc768646ba7b0cbaba4babc27a44d8

commit 6d5880906ecc768646ba7b0cbaba4babc27a44d8
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-06 22:46:55 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:46:55 +0000

    ppbus/ppc: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/dev/ppbus/if_plip.c  | 4 +---
 sys/dev/ppbus/lpbb.c     | 4 +---
 sys/dev/ppbus/lpt.c      | 4 +---
 sys/dev/ppbus/pcfclock.c | 4 +---
 sys/dev/ppbus/ppbconf.c  | 5 ++---
 sys/dev/ppbus/ppi.c      | 5 ++---
 sys/dev/ppbus/pps.c      | 5 ++---
 sys/dev/ppc/ppc.c        | 1 -
 sys/dev/ppc/ppc_acpi.c   | 2 +-
 sys/dev/ppc/ppc_isa.c    | 2 +-
 sys/dev/ppc/ppc_pci.c    | 2 +-
 sys/dev/ppc/ppc_puc.c    | 2 +-
 sys/dev/ppc/ppcvar.h     | 1 -
 13 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 21307ff89b64..e92896e9421f 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -185,8 +185,6 @@ static int lp_module_handler(module_t, int, void *);
 #define	DEVTOSOFTC(dev) \
 	((struct lp_data *)device_get_softc(dev))
 
-static devclass_t lp_devclass;
-
 static int
 lp_module_handler(module_t mod, int what, void *arg)
 {
@@ -849,5 +847,5 @@ static driver_t lp_driver = {
 	sizeof(struct lp_data),
 };
 
-DRIVER_MODULE(plip, ppbus, lp_driver, lp_devclass, lp_module_handler, 0);
+DRIVER_MODULE(plip, ppbus, lp_driver, lp_module_handler, NULL);
 MODULE_DEPEND(plip, ppbus, 1, 1, 1);
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 984ea2e170c6..0d7e52932f35 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -238,8 +238,6 @@ lpbb_reset(device_t dev, u_char speed, u_char addr, u_char * oldaddr)
 	return (IIC_ENOADDR);
 }
 
-static devclass_t lpbb_devclass;
-
 static device_method_t lpbb_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_identify,	lpbb_identify),
@@ -263,7 +261,7 @@ static driver_t lpbb_driver = {
 	1,
 };
 
-DRIVER_MODULE(lpbb, ppbus, lpbb_driver, lpbb_devclass, 0, 0);
+DRIVER_MODULE(lpbb, ppbus, lpbb_driver, 0, 0);
 DRIVER_MODULE(iicbb, lpbb, iicbb_driver, 0, 0);
 MODULE_DEPEND(lpbb, ppbus, 1, 1, 1);
 MODULE_DEPEND(lpbb, iicbb, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER);
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index f87a05e1fcbf..e01aaa5494ae 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -149,8 +149,6 @@ static int	lpt_detect(device_t dev);
 
 static void lptintr(void *arg);
 
-static devclass_t lpt_devclass;
-
 /* bits for state */
 #define	OPEN		(1<<0)	/* device is open */
 #define	ASLP		(1<<1)	/* awaiting draining of printer */
@@ -996,5 +994,5 @@ static driver_t lpt_driver = {
 	sizeof(struct lpt_data),
 };
 
-DRIVER_MODULE(lpt, ppbus, lpt_driver, lpt_devclass, 0, 0);
+DRIVER_MODULE(lpt, ppbus, lpt_driver, 0, 0);
 MODULE_DEPEND(lpt, ppbus, 1, 1, 1);
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 05285573ef95..ee868976493d 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -58,8 +58,6 @@ struct pcfclock_data {
 	struct cdev *cdev;
 };
 
-static devclass_t pcfclock_devclass;
-
 static	d_open_t		pcfclock_open;
 static	d_close_t		pcfclock_close;
 static	d_read_t		pcfclock_read;
@@ -334,4 +332,4 @@ static driver_t pcfclock_driver = {
 	sizeof(struct pcfclock_data),
 };
 
-DRIVER_MODULE(pcfclock, ppbus, pcfclock_driver, pcfclock_devclass, 0, 0);
+DRIVER_MODULE(pcfclock, ppbus, pcfclock_driver, 0, 0);
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 0c58e69e5909..100145708839 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -575,8 +575,6 @@ ppb_release_bus(device_t bus, device_t dev)
 	return (0);
 }
 
-static devclass_t ppbus_devclass;
-
 static device_method_t ppbus_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_probe,		ppbus_probe),
@@ -600,4 +598,5 @@ static driver_t ppbus_driver = {
 	ppbus_methods,
 	sizeof(struct ppb_data),
 };
-DRIVER_MODULE(ppbus, ppc, ppbus_driver, ppbus_devclass, 0, 0);
+
+DRIVER_MODULE(ppbus, ppc, ppbus_driver, 0, 0);
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 3c467f10c055..4374e2284098 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -82,8 +82,6 @@ struct ppi_data {
 #define DEVTOSOFTC(dev) \
 	((struct ppi_data *)device_get_softc(dev))
 
-static devclass_t ppi_devclass;
-
 #ifdef PERIPH_1284
 static void	ppiintr(void *arg);
 #endif
@@ -616,5 +614,6 @@ static driver_t ppi_driver = {
 	ppi_methods,
 	sizeof(struct ppi_data),
 };
-DRIVER_MODULE(ppi, ppbus, ppi_driver, ppi_devclass, 0, 0);
+
+DRIVER_MODULE(ppi, ppbus, ppi_driver, 0, 0);
 MODULE_DEPEND(ppi, ppbus, 1, 1, 1);
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 897ae1b78bd7..92ed0a059eb6 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -61,8 +61,6 @@ static void 	ppshcpoll(void *arg);
 #define DEVTOSOFTC(dev) \
 	((struct pps_data *)device_get_softc(dev))
 
-static devclass_t pps_devclass;
-
 static	d_open_t	ppsopen;
 static	d_close_t	ppsclose;
 static	d_ioctl_t	ppsioctl;
@@ -345,5 +343,6 @@ static driver_t pps_driver = {
 	pps_methods,
 	sizeof(struct pps_data),
 };
-DRIVER_MODULE(pps, ppbus, pps_driver, pps_devclass, 0, 0);
+
+DRIVER_MODULE(pps, ppbus, pps_driver, 0, 0);
 MODULE_DEPEND(pps, ppbus, 1, 1, 1);
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index b452e9007dd4..9d46f81f8d33 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -88,7 +88,6 @@ static void ppcintr(void *arg);
 #define PPC_CONFIG_LOCK(ppc)		critical_enter()
 #define PPC_CONFIG_UNLOCK(ppc)		critical_exit()
 
-devclass_t ppc_devclass;
 const char ppc_driver_name[] = "ppc";
 
 static char *ppc_models[] = {
diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c
index bb52b7370d16..a1fdf705f971 100644
--- a/sys/dev/ppc/ppc_acpi.c
+++ b/sys/dev/ppc/ppc_acpi.c
@@ -112,4 +112,4 @@ ppc_acpi_probe(device_t dev)
 	return (ppc_probe(dev, 0));
 }
 
-DRIVER_MODULE(ppc, acpi, ppc_acpi_driver, ppc_devclass, 0, 0);
+DRIVER_MODULE(ppc, acpi, ppc_acpi_driver, 0, 0);
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 869050050225..274af3084a5a 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -271,5 +271,5 @@ error:
 	return (error);
 }
 
-DRIVER_MODULE(ppc, isa, ppc_isa_driver, ppc_devclass, 0, 0);
+DRIVER_MODULE(ppc, isa, ppc_isa_driver, 0, 0);
 ISA_PNP_INFO(lpc_ids);
diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c
index 58a34d0d2700..9ae4f6c07664 100644
--- a/sys/dev/ppc/ppc_pci.c
+++ b/sys/dev/ppc/ppc_pci.c
@@ -113,4 +113,4 @@ ppc_pci_probe(device_t dev)
 	return (ppc_probe(dev, id->rid));
 }
 
-DRIVER_MODULE(ppc, pci, ppc_pci_driver, ppc_devclass, 0, 0);
+DRIVER_MODULE(ppc, pci, ppc_pci_driver, 0, 0);
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index 42f77a450fb3..22606786f58b 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.c
@@ -94,4 +94,4 @@ ppc_puc_probe(device_t dev)
 	return (ppc_probe(dev, 0));
 }
 
-DRIVER_MODULE(ppc, puc, ppc_puc_driver, ppc_devclass, 0, 0);
+DRIVER_MODULE(ppc, puc, ppc_puc_driver, 0, 0);
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index 08d7a6af4f33..6246040397de 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -50,5 +50,4 @@ int ppc_reset_epp(device_t);
 int ppc_ecp_sync(device_t);
 int ppc_setmode(device_t, int);
 
-extern devclass_t ppc_devclass;
 extern const char ppc_driver_name[];