The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7c146c0cbca3b08c21f0e59409672e8d647bcd44

commit 7c146c0cbca3b08c21f0e59409672e8d647bcd44
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2022-05-06 22:46:58 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2022-05-06 22:46:58 +0000

    fd/fdc: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/dev/fdc/fdc.c      | 6 +-----
 sys/dev/fdc/fdc_acpi.c | 2 +-
 sys/dev/fdc/fdc_isa.c  | 2 +-
 sys/dev/fdc/fdcvar.h   | 2 --
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 5c78d02a5502..812ca43789b4 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1583,10 +1583,6 @@ fd_ioctl(struct g_provider *pp, u_long cmd, void *data, 
int fflag, struct thread
 /*
  * Configuration/initialization stuff, per controller.
  */
-
-devclass_t fdc_devclass;
-static devclass_t fd_devclass;
-
 struct fdc_ivars {
        int     fdunit;
        int     fdtype;
@@ -2112,4 +2108,4 @@ fdc_modevent(module_t mod, int type, void *data)
        return (g_modevent(NULL, type, &g_fd_class));
 }
 
-DRIVER_MODULE(fd, fdc, fd_driver, fd_devclass, fdc_modevent, 0);
+DRIVER_MODULE(fd, fdc, fd_driver, fdc_modevent, 0);
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index 6da5bf135b4a..9926827e353c 100644
--- a/sys/dev/fdc/fdc_acpi.c
+++ b/sys/dev/fdc/fdc_acpi.c
@@ -273,4 +273,4 @@ static driver_t fdc_acpi_driver = {
        sizeof(struct fdc_data)
 };
 
-DRIVER_MODULE(fdc, acpi, fdc_acpi_driver, fdc_devclass, 0, 0);
+DRIVER_MODULE(fdc, acpi, fdc_acpi_driver, 0, 0);
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index 6b22c05fb85e..74865fc8d142 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -222,5 +222,5 @@ static driver_t fdc_driver = {
        sizeof(struct fdc_data)
 };
 
-DRIVER_MODULE(fdc, isa, fdc_driver, fdc_devclass, 0, 0);
+DRIVER_MODULE(fdc, isa, fdc_driver, 0, 0);
 ISA_PNP_INFO(fdc_ids);
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 3a2159db1348..4981e84ce7fe 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -70,8 +70,6 @@ struct fdc_data {
        struct proc *fdc_thread;
 };
 
-extern devclass_t fdc_devclass;
-
 enum fdc_device_ivars {
        FDC_IVAR_FDUNIT,
        FDC_IVAR_FDTYPE,

Reply via email to