The branch main has been updated by jhb:

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

commit a65d077437721068a99baccea82fb1e79c84f230
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

    linuxkpi: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/compat/linuxkpi/common/include/linux/pci.h | 4 +---
 sys/compat/linuxkpi/common/src/linux_i2c.c     | 4 +---
 sys/compat/linuxkpi/common/src/linux_i2cbb.c   | 4 +---
 sys/compat/linuxkpi/common/src/linux_usb.c     | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h 
b/sys/compat/linuxkpi/common/include/linux/pci.h
index e130cf54680e..35a0f70669fb 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -83,10 +83,8 @@ static driver_t _ ## _bus ## _ ## _table ## _driver = {      
                \
        0                                                               \
 };                                                                     \
                                                                        \
-static devclass_t _ ## _bus ## _ ## _table ## _devclass;               \
-                                                                       \
 DRIVER_MODULE(lkpi_ ## _table, pci, _ ## _bus ## _ ## _table ## _driver,\
-       _ ## _bus ## _ ## _table ## _devclass, 0, 0);                   \
+       0, 0);                                                          \
                                                                        \
 MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice",   \
     _bus, lkpi_ ## _table, _table, nitems(_table) - 1)
diff --git a/sys/compat/linuxkpi/common/src/linux_i2c.c 
b/sys/compat/linuxkpi/common/src/linux_i2c.c
index 41edb118af5e..3d4c0b0b0576 100644
--- a/sys/compat/linuxkpi/common/src/linux_i2c.c
+++ b/sys/compat/linuxkpi/common/src/linux_i2c.c
@@ -117,15 +117,13 @@ static device_method_t lkpi_iic_methods[] = {
        DEVMETHOD_END
 };
 
-devclass_t lkpi_iic_devclass;
-
 driver_t lkpi_iic_driver = {
        "lkpi_iic",
        lkpi_iic_methods,
        sizeof(struct lkpi_iic_softc),
 };
 
-DRIVER_MODULE(lkpi_iic, drmn, lkpi_iic_driver, lkpi_iic_devclass, 0, 0);
+DRIVER_MODULE(lkpi_iic, drmn, lkpi_iic_driver, 0, 0);
 DRIVER_MODULE(iicbus, lkpi_iic, iicbus_driver, 0, 0);
 MODULE_DEPEND(linuxkpi, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
 
diff --git a/sys/compat/linuxkpi/common/src/linux_i2cbb.c 
b/sys/compat/linuxkpi/common/src/linux_i2cbb.c
index 9199062f957c..47756a25db3f 100644
--- a/sys/compat/linuxkpi/common/src/linux_i2cbb.c
+++ b/sys/compat/linuxkpi/common/src/linux_i2cbb.c
@@ -121,15 +121,13 @@ static device_method_t lkpi_iicbb_methods[] = {
        DEVMETHOD_END
 };
 
-static devclass_t lkpi_iicbb_devclass;
-
 driver_t lkpi_iicbb_driver = {
        "lkpi_iicbb",
        lkpi_iicbb_methods,
        sizeof(struct lkpi_iicbb_softc),
 };
 
-DRIVER_MODULE(lkpi_iicbb, lkpi_iic, lkpi_iicbb_driver, lkpi_iicbb_devclass, 0, 
0);
+DRIVER_MODULE(lkpi_iicbb, lkpi_iic, lkpi_iicbb_driver, 0, 0);
 DRIVER_MODULE(iicbb, lkpi_iicbb, iicbb_driver, 0, 0);
 MODULE_DEPEND(lkpi_iicbb, iicbb, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER);
 
diff --git a/sys/compat/linuxkpi/common/src/linux_usb.c 
b/sys/compat/linuxkpi/common/src/linux_usb.c
index 05fb63b93142..dd1cb5bed9c3 100644
--- a/sys/compat/linuxkpi/common/src/linux_usb.c
+++ b/sys/compat/linuxkpi/common/src/linux_usb.c
@@ -122,9 +122,7 @@ static driver_t usb_linux_driver = {
        .size = sizeof(struct usb_linux_softc),
 };
 
-static devclass_t usb_linux_devclass;
-
-DRIVER_MODULE(usb_linux, uhub, usb_linux_driver, usb_linux_devclass, NULL, 0);
+DRIVER_MODULE(usb_linux, uhub, usb_linux_driver, NULL, NULL);
 MODULE_VERSION(usb_linux, 1);
 
 /*------------------------------------------------------------------------*

Reply via email to