git: 3a86615217bf - main - iicbus: Remove unused devclass arguments to DRIVER_MODULE.
Date: Fri, 06 May 2022 22:43:28 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=3a86615217bfa70b2bbaeb85e36026da33a11059
commit 3a86615217bfa70b2bbaeb85e36026da33a11059
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-20 16:37:34 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:39:30 +0000
iicbus: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/dev/iicbus/ad7417.c | 4 +---
sys/dev/iicbus/ad7418.c | 3 +--
sys/dev/iicbus/adm1030.c | 4 +---
sys/dev/iicbus/ads111x.c | 3 +--
sys/dev/iicbus/adt746x.c | 4 +---
sys/dev/iicbus/ds1307.c | 4 +---
sys/dev/iicbus/ds13rtc.c | 4 +---
sys/dev/iicbus/ds1631.c | 4 +---
sys/dev/iicbus/ds1672.c | 3 +--
sys/dev/iicbus/ds1775.c | 4 +---
sys/dev/iicbus/ds3231.c | 4 +---
sys/dev/iicbus/gpio/pcf8574.c | 4 +---
sys/dev/iicbus/gpio/tca6408.c | 4 +---
sys/dev/iicbus/gpio/tca6416.c | 4 +---
sys/dev/iicbus/htu21.c | 4 +---
sys/dev/iicbus/icee.c | 3 +--
sys/dev/iicbus/if_ic.c | 4 +---
sys/dev/iicbus/iic.c | 4 +---
sys/dev/iicbus/iichid.c | 4 +---
sys/dev/iicbus/iicoc.c | 2 --
sys/dev/iicbus/iicoc.h | 2 --
sys/dev/iicbus/iicoc_fdt.c | 2 +-
sys/dev/iicbus/iicoc_pci.c | 2 +-
sys/dev/iicbus/iicsmb.c | 4 +---
sys/dev/iicbus/isl12xx.c | 3 +--
sys/dev/iicbus/lm75.c | 4 +---
sys/dev/iicbus/max44009.c | 4 +---
sys/dev/iicbus/max6690.c | 4 +---
sys/dev/iicbus/mux/iic_gpiomux.c | 6 ++----
sys/dev/iicbus/mux/ltc430x.c | 4 +---
sys/dev/iicbus/mux/pca9547.c | 3 +--
sys/dev/iicbus/mux/pca954x.c | 4 +---
sys/dev/iicbus/nxprtc.c | 4 +---
sys/dev/iicbus/pcf8591.c | 4 +---
sys/dev/iicbus/pmic/act8846.c | 5 ++---
sys/dev/iicbus/pmic/fan53555.c | 4 +---
sys/dev/iicbus/pmic/rockchip/rk805.c | 4 +---
sys/dev/iicbus/pmic/rockchip/rk808.c | 4 +---
sys/dev/iicbus/rtc/hym8563.c | 5 ++---
sys/dev/iicbus/rtc/pcf85063.c | 4 +---
sys/dev/iicbus/rtc/rx8803.c | 4 +---
sys/dev/iicbus/rtc8583.c | 3 +--
sys/dev/iicbus/s35390a.c | 3 +--
sys/dev/iicbus/sy8106a.c | 5 +----
sys/dev/iicbus/syr827.c | 5 +----
sys/dev/iicbus/tmp461.c | 4 +---
sys/dev/iicbus/twsi/a10_twsi.c | 4 +---
sys/dev/iicbus/twsi/mv_twsi.c | 4 +---
48 files changed, 49 insertions(+), 133 deletions(-)
diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/ad7417.c
index 6e110d698a4d..830d73c7ac8d 100644
--- a/sys/dev/iicbus/ad7417.c
+++ b/sys/dev/iicbus/ad7417.c
@@ -120,9 +120,7 @@ static driver_t ad7417_driver = {
sizeof(struct ad7417_softc)
};
-static devclass_t ad7417_devclass;
-
-DRIVER_MODULE(ad7417, iicbus, ad7417_driver, ad7417_devclass, 0, 0);
+DRIVER_MODULE(ad7417, iicbus, ad7417_driver, 0, 0);
static MALLOC_DEFINE(M_AD7417, "ad7417", "Supply-Monitor AD7417");
diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/ad7418.c
index b2743d0f0b57..f201880815d9 100644
--- a/sys/dev/iicbus/ad7418.c
+++ b/sys/dev/iicbus/ad7418.c
@@ -222,8 +222,7 @@ static driver_t ad7418_driver = {
ad7418_methods,
sizeof(struct ad7418_softc),
};
-static devclass_t ad7418_devclass;
-DRIVER_MODULE(ad7418, iicbus, ad7418_driver, ad7418_devclass, 0, 0);
+DRIVER_MODULE(ad7418, iicbus, ad7418_driver, 0, 0);
MODULE_VERSION(ad7418, 1);
MODULE_DEPEND(ad7418, iicbus, 1, 1, 1);
diff --git a/sys/dev/iicbus/adm1030.c b/sys/dev/iicbus/adm1030.c
index 6a28a73b6d9c..1ecb301cf9d7 100644
--- a/sys/dev/iicbus/adm1030.c
+++ b/sys/dev/iicbus/adm1030.c
@@ -85,9 +85,7 @@ static driver_t adm1030_driver = {
sizeof(struct adm1030_softc)
};
-static devclass_t adm1030_devclass;
-
-DRIVER_MODULE(adm1030, iicbus, adm1030_driver, adm1030_devclass, 0, 0);
+DRIVER_MODULE(adm1030, iicbus, adm1030_driver, 0, 0);
static int
adm1030_write_byte(device_t dev, uint32_t addr, uint8_t reg, uint8_t byte)
diff --git a/sys/dev/iicbus/ads111x.c b/sys/dev/iicbus/ads111x.c
index 5d7057d99b91..d809fb86fd6b 100644
--- a/sys/dev/iicbus/ads111x.c
+++ b/sys/dev/iicbus/ads111x.c
@@ -606,8 +606,7 @@ static driver_t ads111x_driver = {
ads111x_methods,
sizeof(struct ads111x_softc),
};
-static devclass_t ads111x_devclass;
-DRIVER_MODULE(ads111x, iicbus, ads111x_driver, ads111x_devclass, NULL, NULL);
+DRIVER_MODULE(ads111x, iicbus, ads111x_driver, NULL, NULL);
MODULE_VERSION(ads111x, 1);
MODULE_DEPEND(ads111x, iicbus, 1, 1, 1);
diff --git a/sys/dev/iicbus/adt746x.c b/sys/dev/iicbus/adt746x.c
index 6112f9a9dd36..a184651d7b03 100644
--- a/sys/dev/iicbus/adt746x.c
+++ b/sys/dev/iicbus/adt746x.c
@@ -143,9 +143,7 @@ static driver_t adt746x_driver = {
sizeof(struct adt746x_softc)
};
-static devclass_t adt746x_devclass;
-
-DRIVER_MODULE(adt746x, iicbus, adt746x_driver, adt746x_devclass, 0, 0);
+DRIVER_MODULE(adt746x, iicbus, adt746x_driver, 0, 0);
static MALLOC_DEFINE(M_ADT746X, "adt746x", "ADT Sensor Information");
diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/ds1307.c
index 47f47bb07f5e..2ba712400fe4 100644
--- a/sys/dev/iicbus/ds1307.c
+++ b/sys/dev/iicbus/ds1307.c
@@ -425,9 +425,7 @@ static driver_t ds1307_driver = {
sizeof(struct ds1307_softc),
};
-static devclass_t ds1307_devclass;
-
-DRIVER_MODULE(ds1307, iicbus, ds1307_driver, ds1307_devclass, NULL, NULL);
+DRIVER_MODULE(ds1307, iicbus, ds1307_driver, NULL, NULL);
MODULE_VERSION(ds1307, 1);
MODULE_DEPEND(ds1307, iicbus, 1, 1, 1);
IICBUS_FDT_PNP_INFO(ds1307_compat_data);
diff --git a/sys/dev/iicbus/ds13rtc.c b/sys/dev/iicbus/ds13rtc.c
index 1b21c6c33d80..afc4f6105e97 100644
--- a/sys/dev/iicbus/ds13rtc.c
+++ b/sys/dev/iicbus/ds13rtc.c
@@ -613,9 +613,7 @@ static driver_t ds13rtc_driver = {
sizeof(struct ds13rtc_softc),
};
-static devclass_t ds13rtc_devclass;
-
-DRIVER_MODULE(ds13rtc, iicbus, ds13rtc_driver, ds13rtc_devclass, NULL, NULL);
+DRIVER_MODULE(ds13rtc, iicbus, ds13rtc_driver, NULL, NULL);
MODULE_VERSION(ds13rtc, 1);
MODULE_DEPEND(ds13rtc, iicbus, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/ds1631.c
index f552005a739b..02df149b2738 100644
--- a/sys/dev/iicbus/ds1631.c
+++ b/sys/dev/iicbus/ds1631.c
@@ -113,9 +113,7 @@ static driver_t ds1631_driver = {
sizeof(struct ds1631_softc)
};
-static devclass_t ds1631_devclass;
-
-DRIVER_MODULE(ds1631, iicbus, ds1631_driver, ds1631_devclass, 0, 0);
+DRIVER_MODULE(ds1631, iicbus, ds1631_driver, 0, 0);
static int
ds1631_write(device_t dev, uint32_t addr, uint8_t reg, uint8_t *buff, int len)
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/ds1672.c
index 6b204789bce9..fae1f06fa5dd 100644
--- a/sys/dev/iicbus/ds1672.c
+++ b/sys/dev/iicbus/ds1672.c
@@ -187,8 +187,7 @@ static driver_t ds1672_driver = {
ds1672_methods,
sizeof(struct ds1672_softc),
};
-static devclass_t ds1672_devclass;
-DRIVER_MODULE(ds1672, iicbus, ds1672_driver, ds1672_devclass, 0, 0);
+DRIVER_MODULE(ds1672, iicbus, ds1672_driver, 0, 0);
MODULE_VERSION(ds1672, 1);
MODULE_DEPEND(ds1672, iicbus, 1, 1, 1);
diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/ds1775.c
index 223ce4410b72..4bfc2c62c697 100644
--- a/sys/dev/iicbus/ds1775.c
+++ b/sys/dev/iicbus/ds1775.c
@@ -86,9 +86,7 @@ static driver_t ds1775_driver = {
sizeof(struct ds1775_softc)
};
-static devclass_t ds1775_devclass;
-
-DRIVER_MODULE(ds1775, iicbus, ds1775_driver, ds1775_devclass, 0, 0);
+DRIVER_MODULE(ds1775, iicbus, ds1775_driver, 0, 0);
static int
ds1775_read_2(device_t dev, uint32_t addr, uint8_t reg, uint16_t *data)
diff --git a/sys/dev/iicbus/ds3231.c b/sys/dev/iicbus/ds3231.c
index 0e95379da500..8e5b4c548879 100644
--- a/sys/dev/iicbus/ds3231.c
+++ b/sys/dev/iicbus/ds3231.c
@@ -617,8 +617,6 @@ static driver_t ds3231_driver = {
sizeof(struct ds3231_softc),
};
-static devclass_t ds3231_devclass;
-
-DRIVER_MODULE(ds3231, iicbus, ds3231_driver, ds3231_devclass, NULL, NULL);
+DRIVER_MODULE(ds3231, iicbus, ds3231_driver, NULL, NULL);
MODULE_VERSION(ds3231, 1);
MODULE_DEPEND(ds3231, iicbus, 1, 1, 1);
diff --git a/sys/dev/iicbus/gpio/pcf8574.c b/sys/dev/iicbus/gpio/pcf8574.c
index 6fa544ac3283..6de6c51a0c7b 100644
--- a/sys/dev/iicbus/gpio/pcf8574.c
+++ b/sys/dev/iicbus/gpio/pcf8574.c
@@ -414,9 +414,7 @@ static driver_t pcf8574_driver = {
sizeof(struct pcf8574_softc)
};
-static devclass_t pcf8574_devclass;
-
-DRIVER_MODULE(pcf8574, iicbus, pcf8574_driver, pcf8574_devclass, 0, 0);
+DRIVER_MODULE(pcf8574, iicbus, pcf8574_driver, 0, 0);
MODULE_DEPEND(pcf8574, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_DEPEND(pcf8574, gpiobus, 1, 1, 1);
MODULE_VERSION(pcf8574, 1);
diff --git a/sys/dev/iicbus/gpio/tca6408.c b/sys/dev/iicbus/gpio/tca6408.c
index 36f6108e2e68..e72cd276fdda 100644
--- a/sys/dev/iicbus/gpio/tca6408.c
+++ b/sys/dev/iicbus/gpio/tca6408.c
@@ -106,9 +106,7 @@ static struct ofw_compat_data tca6408_compat_data[] = {
{ NULL, 0}
};
-devclass_t tca6408_devclass;
-
-DRIVER_MODULE(tca6408, iicbus, tca6408_driver, tca6408_devclass, 0, 0);
+DRIVER_MODULE(tca6408, iicbus, tca6408_driver, 0, 0);
IICBUS_FDT_PNP_INFO(tca6408_compat_data);
static int
diff --git a/sys/dev/iicbus/gpio/tca6416.c b/sys/dev/iicbus/gpio/tca6416.c
index a3891207df73..1e03e341c96c 100644
--- a/sys/dev/iicbus/gpio/tca6416.c
+++ b/sys/dev/iicbus/gpio/tca6416.c
@@ -131,9 +131,7 @@ static driver_t tca6416_driver = {
sizeof(struct tca6416_softc)
};
-static devclass_t tca6416_devclass;
-
-DRIVER_MODULE(tca6416, iicbus, tca6416_driver, tca6416_devclass, 0, 0);
+DRIVER_MODULE(tca6416, iicbus, tca6416_driver, 0, 0);
MODULE_VERSION(tca6416, 1);
static struct ofw_compat_data compat_data[] = {
diff --git a/sys/dev/iicbus/htu21.c b/sys/dev/iicbus/htu21.c
index 53a2bf6d234b..71753e7e9fd1 100644
--- a/sys/dev/iicbus/htu21.c
+++ b/sys/dev/iicbus/htu21.c
@@ -521,9 +521,7 @@ static driver_t htu21_driver = {
sizeof(struct htu21_softc)
};
-static devclass_t htu21_devclass;
-
-DRIVER_MODULE(htu21, iicbus, htu21_driver, htu21_devclass, 0, 0);
+DRIVER_MODULE(htu21, iicbus, htu21_driver, 0, 0);
MODULE_DEPEND(htu21, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(htu21, 1);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c
index a658d73cb875..8fc020c34653 100644
--- a/sys/dev/iicbus/icee.c
+++ b/sys/dev/iicbus/icee.c
@@ -348,9 +348,8 @@ static driver_t icee_driver = {
icee_methods,
sizeof(struct icee_softc),
};
-static devclass_t icee_devclass;
-DRIVER_MODULE(icee, iicbus, icee_driver, icee_devclass, 0, 0);
+DRIVER_MODULE(icee, iicbus, icee_driver, 0, 0);
MODULE_VERSION(icee, 1);
MODULE_DEPEND(icee, iicbus, 1, 1, 1);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 603265a52b13..623ee178e4e8 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -96,8 +96,6 @@ struct ic_softc {
#define IC_BUFFERS_BUSY (IC_OBUF_BUSY | IC_IFBUF_BUSY)
#define IC_BUFFER_WAITER 0x0004
-static devclass_t ic_devclass;
-
static int icprobe(device_t);
static int icattach(device_t);
@@ -435,6 +433,6 @@ error:
return(0);
}
-DRIVER_MODULE(ic, iicbus, ic_driver, ic_devclass, 0, 0);
+DRIVER_MODULE(ic, iicbus, ic_driver, 0, 0);
MODULE_DEPEND(ic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(ic, 1);
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index b4a60c29ca9a..bb2a361eee0e 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -74,8 +74,6 @@ static int iicuio_move(struct iic_cdevpriv *priv, struct uio *uio, int last);
static int iicuio(struct cdev *dev, struct uio *uio, int ioflag);
static int iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags);
-static devclass_t iic_devclass;
-
static device_method_t iic_methods[] = {
/* device interface */
DEVMETHOD(device_identify, iic_identify),
@@ -499,6 +497,6 @@ iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t
return (error);
}
-DRIVER_MODULE(iic, iicbus, iic_driver, iic_devclass, 0, 0);
+DRIVER_MODULE(iic, iicbus, iic_driver, 0, 0);
MODULE_DEPEND(iic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(iic, 1);
diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c
index bb8945245a2e..3e481ccd4417 100644
--- a/sys/dev/iicbus/iichid.c
+++ b/sys/dev/iicbus/iichid.c
@@ -1289,8 +1289,6 @@ iichid_resume(device_t dev)
return (0);
}
-static devclass_t iichid_devclass;
-
static device_method_t iichid_methods[] = {
DEVMETHOD(device_probe, iichid_probe),
DEVMETHOD(device_attach, iichid_attach),
@@ -1323,7 +1321,7 @@ static driver_t iichid_driver = {
.size = sizeof(struct iichid_softc),
};
-DRIVER_MODULE(iichid, iicbus, iichid_driver, iichid_devclass, NULL, 0);
+DRIVER_MODULE(iichid, iicbus, iichid_driver, NULL, NULL);
MODULE_DEPEND(iichid, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_DEPEND(iichid, acpi, 1, 1, 1);
MODULE_DEPEND(iichid, hid, 1, 1, 1);
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/iicoc.c
index 2284bbf8cc27..d814a44e6188 100644
--- a/sys/dev/iicbus/iicoc.c
+++ b/sys/dev/iicbus/iicoc.c
@@ -48,8 +48,6 @@ __FBSDID("$FreeBSD$");
#include "iicbus_if.h"
#include "iicoc.h"
-devclass_t iicoc_devclass;
-
DRIVER_MODULE(iicbus, iicoc, iicbus_driver, 0, 0);
static void
diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/iicoc.h
index c9b91ef1a895..c6f20ad1ebe9 100644
--- a/sys/dev/iicbus/iicoc.h
+++ b/sys/dev/iicbus/iicoc.h
@@ -92,8 +92,6 @@ struct iicoc_softc {
#endif
-extern devclass_t iicoc_devclass;
-
int iicoc_iicbus_start(device_t dev, u_char slave, int timeout);
int iicoc_iicbus_stop(device_t dev);
int iicoc_iicbus_read(device_t dev, char *buf, int len, int *read, int last,
diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/iicoc_fdt.c
index 59f256f0676f..79482287f081 100644
--- a/sys/dev/iicbus/iicoc_fdt.c
+++ b/sys/dev/iicbus/iicoc_fdt.c
@@ -186,7 +186,7 @@ static driver_t iicoc_driver = {
};
SIMPLEBUS_PNP_INFO(compat_data);
-DRIVER_MODULE(iicoc, simplebus, iicoc_driver, iicoc_devclass, 0, 0);
+DRIVER_MODULE(iicoc, simplebus, iicoc_driver, 0, 0);
DRIVER_MODULE(ofw_iicbus, iicoc, ofw_iicbus_driver, 0, 0);
MODULE_DEPEND(iicoc, iicbus, 1, 1, 1);
MODULE_DEPEND(iicoc, ofw_iicbus, 1, 1, 1);
diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/iicoc_pci.c
index ba076a2cb9bd..ea9197f56df6 100644
--- a/sys/dev/iicbus/iicoc_pci.c
+++ b/sys/dev/iicbus/iicoc_pci.c
@@ -138,4 +138,4 @@ static driver_t iicoc_driver = {
sizeof(struct iicoc_softc),
};
-DRIVER_MODULE(iicoc, pci, iicoc_driver, iicoc_devclass, 0, 0);
+DRIVER_MODULE(iicoc, pci, iicoc_driver, 0, 0);
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 5bb3630ae720..bd631601deb5 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -100,8 +100,6 @@ static int iicsmb_pcall(device_t dev, u_char slave, char cmd, short sdata, short
static int iicsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf);
static int iicsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf);
-static devclass_t iicsmb_devclass;
-
static device_method_t iicsmb_methods[] = {
/* device interface */
DEVMETHOD(device_identify, iicsmb_identify),
@@ -475,7 +473,7 @@ iicsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf)
return (iic2smb_error(error));
}
-DRIVER_MODULE(iicsmb, iicbus, iicsmb_driver, iicsmb_devclass, 0, 0);
+DRIVER_MODULE(iicsmb, iicbus, iicsmb_driver, 0, 0);
DRIVER_MODULE(smbus, iicsmb, smbus_driver, 0, 0);
MODULE_DEPEND(iicsmb, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_DEPEND(iicsmb, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
diff --git a/sys/dev/iicbus/isl12xx.c b/sys/dev/iicbus/isl12xx.c
index b43bcb0ed27a..c5008d996643 100644
--- a/sys/dev/iicbus/isl12xx.c
+++ b/sys/dev/iicbus/isl12xx.c
@@ -353,9 +353,8 @@ static driver_t isl12xx_driver = {
isl12xx_methods,
sizeof(struct isl12xx_softc),
};
-static devclass_t isl12xx_devclass;
-DRIVER_MODULE(isl12xx, iicbus, isl12xx_driver, isl12xx_devclass, NULL, NULL);
+DRIVER_MODULE(isl12xx, iicbus, isl12xx_driver, NULL, NULL);
MODULE_VERSION(isl12xx, 1);
MODULE_DEPEND(isl12xx, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/lm75.c b/sys/dev/iicbus/lm75.c
index 025c449284fd..19630aee11fe 100644
--- a/sys/dev/iicbus/lm75.c
+++ b/sys/dev/iicbus/lm75.c
@@ -120,9 +120,7 @@ static driver_t lm75_driver = {
sizeof(struct lm75_softc)
};
-static devclass_t lm75_devclass;
-
-DRIVER_MODULE(lm75, iicbus, lm75_driver, lm75_devclass, 0, 0);
+DRIVER_MODULE(lm75, iicbus, lm75_driver, 0, 0);
static int
lm75_read(device_t dev, uint32_t addr, uint8_t reg, uint8_t *data, size_t len)
diff --git a/sys/dev/iicbus/max44009.c b/sys/dev/iicbus/max44009.c
index 739b43ed9055..850cc2abf419 100644
--- a/sys/dev/iicbus/max44009.c
+++ b/sys/dev/iicbus/max44009.c
@@ -185,9 +185,7 @@ static driver_t max44009_driver = {
sizeof(struct max44009_softc)
};
-static devclass_t max44009_devclass;
-
-DRIVER_MODULE(max44009, iicbus, max44009_driver, max44009_devclass, 0, 0);
+DRIVER_MODULE(max44009, iicbus, max44009_driver, 0, 0);
MODULE_DEPEND(max44009, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(max44009, 1);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/max6690.c
index c6c6666c3d41..4e263cb0ff61 100644
--- a/sys/dev/iicbus/max6690.c
+++ b/sys/dev/iicbus/max6690.c
@@ -99,9 +99,7 @@ static driver_t max6690_driver = {
sizeof(struct max6690_softc)
};
-static devclass_t max6690_devclass;
-
-DRIVER_MODULE(max6690, iicbus, max6690_driver, max6690_devclass, 0, 0);
+DRIVER_MODULE(max6690, iicbus, max6690_driver, 0, 0);
static MALLOC_DEFINE(M_MAX6690, "max6690", "Temp-Monitor MAX6690");
static int
diff --git a/sys/dev/iicbus/mux/iic_gpiomux.c b/sys/dev/iicbus/mux/iic_gpiomux.c
index 9184aa83f766..6ed50017938e 100644
--- a/sys/dev/iicbus/mux/iic_gpiomux.c
+++ b/sys/dev/iicbus/mux/iic_gpiomux.c
@@ -250,12 +250,10 @@ static device_method_t gpiomux_methods[] = {
DEVMETHOD_END
};
-static devclass_t gpiomux_devclass;
-
DEFINE_CLASS_1(iic_gpiomux, iic_gpiomux_driver, gpiomux_methods,
sizeof(struct gpiomux_softc), iicmux_driver);
-DRIVER_MODULE(iic_gpiomux, simplebus, iic_gpiomux_driver, gpiomux_devclass, 0, 0);
-DRIVER_MODULE(iic_gpiomux, ofw_simplebus, iic_gpiomux_driver, gpiomux_devclass, 0, 0);
+DRIVER_MODULE(iic_gpiomux, simplebus, iic_gpiomux_driver, 0, 0);
+DRIVER_MODULE(iic_gpiomux, ofw_simplebus, iic_gpiomux_driver, 0, 0);
#ifdef FDT
DRIVER_MODULE(ofw_iicbus, iic_gpiomux, ofw_iicbus_driver, 0, 0);
diff --git a/sys/dev/iicbus/mux/ltc430x.c b/sys/dev/iicbus/mux/ltc430x.c
index d19b33f525f5..365a1d1e55d8 100644
--- a/sys/dev/iicbus/mux/ltc430x.c
+++ b/sys/dev/iicbus/mux/ltc430x.c
@@ -241,11 +241,9 @@ static device_method_t ltc430x_methods[] = {
DEVMETHOD_END
};
-static devclass_t ltc430x_devclass;
-
DEFINE_CLASS_1(ltc430x, ltc430x_driver, ltc430x_methods,
sizeof(struct ltc430x_softc), iicmux_driver);
-DRIVER_MODULE(ltc430x, iicbus, ltc430x_driver, ltc430x_devclass, 0, 0);
+DRIVER_MODULE(ltc430x, iicbus, ltc430x_driver, 0, 0);
#ifdef FDT
DRIVER_MODULE(ofw_iicbus, ltc430x, ofw_iicbus_driver, 0, 0);
diff --git a/sys/dev/iicbus/mux/pca9547.c b/sys/dev/iicbus/mux/pca9547.c
index 76ccede29a5c..aa8306154035 100644
--- a/sys/dev/iicbus/mux/pca9547.c
+++ b/sys/dev/iicbus/mux/pca9547.c
@@ -151,10 +151,9 @@ static device_method_t pca9547_methods[] = {
DEVMETHOD_END
};
-static devclass_t pca9547_devclass;
DEFINE_CLASS_1(iicmux, pca9547_driver, pca9547_methods,
sizeof(struct pca9547_softc), iicmux_driver);
-DRIVER_MODULE(pca_iicmux, iicbus, pca9547_driver, pca9547_devclass, 0, 0);
+DRIVER_MODULE(pca_iicmux, iicbus, pca9547_driver, 0, 0);
DRIVER_MODULE(iicbus, iicmux, iicbus_driver, 0, 0);
DRIVER_MODULE(ofw_iicbus, iicmux, ofw_iicbus_driver, 0, 0);
MODULE_DEPEND(pca9547, iicmux, 1, 1, 1);
diff --git a/sys/dev/iicbus/mux/pca954x.c b/sys/dev/iicbus/mux/pca954x.c
index 3a0d416d1f6e..7890ace47549 100644
--- a/sys/dev/iicbus/mux/pca954x.c
+++ b/sys/dev/iicbus/mux/pca954x.c
@@ -193,11 +193,9 @@ static device_method_t pca954x_methods[] = {
DEVMETHOD_END
};
-static devclass_t pca954x_devclass;
-
DEFINE_CLASS_1(pca9548, pca954x_driver, pca954x_methods,
sizeof(struct pca954x_softc), iicmux_driver);
-DRIVER_MODULE(pca9548, iicbus, pca954x_driver, pca954x_devclass, 0, 0);
+DRIVER_MODULE(pca9548, iicbus, pca954x_driver, 0, 0);
#ifdef FDT
DRIVER_MODULE(ofw_iicbus, pca9548, ofw_iicbus_driver, 0, 0);
diff --git a/sys/dev/iicbus/nxprtc.c b/sys/dev/iicbus/nxprtc.c
index 0e5162fcd395..74ff3acef914 100644
--- a/sys/dev/iicbus/nxprtc.c
+++ b/sys/dev/iicbus/nxprtc.c
@@ -1012,9 +1012,7 @@ static driver_t nxprtc_driver = {
sizeof(struct nxprtc_softc),
};
-static devclass_t nxprtc_devclass;
-
-DRIVER_MODULE(nxprtc, iicbus, nxprtc_driver, nxprtc_devclass, NULL, NULL);
+DRIVER_MODULE(nxprtc, iicbus, nxprtc_driver, NULL, NULL);
MODULE_VERSION(nxprtc, 1);
MODULE_DEPEND(nxprtc, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/pcf8591.c b/sys/dev/iicbus/pcf8591.c
index 5bae3f0f272c..407f94ae7d91 100644
--- a/sys/dev/iicbus/pcf8591.c
+++ b/sys/dev/iicbus/pcf8591.c
@@ -258,9 +258,7 @@ static driver_t pcf8591_driver = {
sizeof(struct pcf8591_softc)
};
-static devclass_t pcf8591_devclass;
-
-DRIVER_MODULE(pcf8591, iicbus, pcf8591_driver, pcf8591_devclass, 0, 0);
+DRIVER_MODULE(pcf8591, iicbus, pcf8591_driver, 0, 0);
MODULE_DEPEND(pcf8591, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(pcf8591, 1);
#ifdef FDT
diff --git a/sys/dev/iicbus/pmic/act8846.c b/sys/dev/iicbus/pmic/act8846.c
index 643f94aa7a7d..0a1a8d4eedda 100644
--- a/sys/dev/iicbus/pmic/act8846.c
+++ b/sys/dev/iicbus/pmic/act8846.c
@@ -247,12 +247,11 @@ static device_method_t act8846_methods[] = {
DEVMETHOD_END
};
-static devclass_t act8846_devclass;
static DEFINE_CLASS_0(act8846_pmu, act8846_driver, act8846_methods,
sizeof(struct act8846_softc));
-EARLY_DRIVER_MODULE(act8846_pmic, iicbus, act8846_driver, act8846_devclass,
+EARLY_DRIVER_MODULE(act8846_pmic, iicbus, act8846_driver,
NULL, NULL, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
MODULE_VERSION(act8846_pmic, 1);
MODULE_DEPEND(act8846_pmic, iicbus, IICBUS_MINVER, IICBUS_PREFVER,
IICBUS_MAXVER);
-IICBUS_FDT_PNP_INFO(compat_data);
\ No newline at end of file
+IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/pmic/fan53555.c b/sys/dev/iicbus/pmic/fan53555.c
index 3856343c5352..3d40aae9e415 100644
--- a/sys/dev/iicbus/pmic/fan53555.c
+++ b/sys/dev/iicbus/pmic/fan53555.c
@@ -466,12 +466,10 @@ static device_method_t fan53555_methods[] = {
DEVMETHOD_END
};
-static devclass_t fan53555_devclass;
static DEFINE_CLASS_0(fan53555_pmic, fan53555_driver, fan53555_methods,
sizeof(struct fan53555_softc));
-EARLY_DRIVER_MODULE(fan53555, iicbus, fan53555_driver, fan53555_devclass, 0, 0,
- BUS_PASS_RESOURCE);
+EARLY_DRIVER_MODULE(fan53555, iicbus, fan53555_driver, 0, 0, BUS_PASS_RESOURCE);
MODULE_VERSION(fan53555, 1);
MODULE_DEPEND(fan53555, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/pmic/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c
index 0a4745602507..c9e5917f4215 100644
--- a/sys/dev/iicbus/pmic/rockchip/rk805.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk805.c
@@ -192,9 +192,7 @@ static device_method_t rk805_methods[] = {
DEFINE_CLASS_1(rk805_pmu, rk805_driver, rk805_methods,
sizeof(struct rk8xx_softc), rk8xx_driver);
-static devclass_t rk805_devclass;
-
-EARLY_DRIVER_MODULE(rk805_pmu, iicbus, rk805_driver, rk805_devclass, 0, 0,
+EARLY_DRIVER_MODULE(rk805_pmu, iicbus, rk805_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
EARLY_DRIVER_MODULE(iicbus, rk805_pmu, iicbus_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
diff --git a/sys/dev/iicbus/pmic/rockchip/rk808.c b/sys/dev/iicbus/pmic/rockchip/rk808.c
index 056de8debcdf..ce4d5767be74 100644
--- a/sys/dev/iicbus/pmic/rockchip/rk808.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk808.c
@@ -267,9 +267,7 @@ static device_method_t rk808_methods[] = {
DEFINE_CLASS_1(rk808_pmu, rk808_driver, rk808_methods,
sizeof(struct rk8xx_softc), rk8xx_driver);
-static devclass_t rk808_devclass;
-
-EARLY_DRIVER_MODULE(rk808_pmu, iicbus, rk808_driver, rk808_devclass, 0, 0,
+EARLY_DRIVER_MODULE(rk808_pmu, iicbus, rk808_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
EARLY_DRIVER_MODULE(iicbus, rk808_pmu, iicbus_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
diff --git a/sys/dev/iicbus/rtc/hym8563.c b/sys/dev/iicbus/rtc/hym8563.c
index 54ecee145c66..58ea513420a1 100644
--- a/sys/dev/iicbus/rtc/hym8563.c
+++ b/sys/dev/iicbus/rtc/hym8563.c
@@ -305,10 +305,9 @@ static device_method_t hym8563_methods[] = {
DEVMETHOD_END,
};
-static devclass_t hym8563_devclass;
static DEFINE_CLASS_0(hym8563_rtc, hym8563_driver, hym8563_methods,
sizeof(struct hym8563_softc));
-DRIVER_MODULE(hym8563, iicbus, hym8563_driver, hym8563_devclass, NULL, NULL);
+DRIVER_MODULE(hym8563, iicbus, hym8563_driver, NULL, NULL);
MODULE_VERSION(hym8563, 1);
MODULE_DEPEND(hym8563, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
-IICBUS_FDT_PNP_INFO(compat_data);
\ No newline at end of file
+IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/rtc/pcf85063.c b/sys/dev/iicbus/rtc/pcf85063.c
index af2417a497db..857e42fb9c43 100644
--- a/sys/dev/iicbus/rtc/pcf85063.c
+++ b/sys/dev/iicbus/rtc/pcf85063.c
@@ -271,7 +271,5 @@ static driver_t pcf85063_driver = {
0
};
-static devclass_t pcf85063_devclass;
-
-DRIVER_MODULE(pcf85063, iicbus, pcf85063_driver, pcf85063_devclass, NULL, NULL);
+DRIVER_MODULE(pcf85063, iicbus, pcf85063_driver, NULL, NULL);
IICBUS_FDT_PNP_INFO(pcf85063_compat_data);
diff --git a/sys/dev/iicbus/rtc/rx8803.c b/sys/dev/iicbus/rtc/rx8803.c
index 2b8dc3623dd9..7bd53537e755 100644
--- a/sys/dev/iicbus/rtc/rx8803.c
+++ b/sys/dev/iicbus/rtc/rx8803.c
@@ -237,7 +237,5 @@ static driver_t rx8803_driver = {
0, /* We don't need softc for this one. */
};
-static devclass_t rx8803_devclass;
-
-DRIVER_MODULE(rx8803, iicbus, rx8803_driver, rx8803_devclass, NULL, NULL);
+DRIVER_MODULE(rx8803, iicbus, rx8803_driver, NULL, NULL);
MODULE_DEPEND(rx8803, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
diff --git a/sys/dev/iicbus/rtc8583.c b/sys/dev/iicbus/rtc8583.c
index 6fb81a63d260..fab62b4c5af8 100644
--- a/sys/dev/iicbus/rtc8583.c
+++ b/sys/dev/iicbus/rtc8583.c
@@ -297,9 +297,8 @@ static driver_t rtc8583_driver = {
rtc8583_methods,
sizeof(struct rtc8583_softc),
};
-static devclass_t rtc8583_devclass;
-DRIVER_MODULE(rtc8583, iicbus, rtc8583_driver, rtc8583_devclass, NULL, NULL);
+DRIVER_MODULE(rtc8583, iicbus, rtc8583_driver, NULL, NULL);
MODULE_VERSION(rtc8583, 1);
MODULE_DEPEND(rtc8583, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c
index 3b026f5b8d87..edf2cdd17ec0 100644
--- a/sys/dev/iicbus/s35390a.c
+++ b/sys/dev/iicbus/s35390a.c
@@ -363,8 +363,7 @@ static driver_t s390rtc_driver = {
s390rtc_methods,
sizeof(struct s390rtc_softc),
};
-static devclass_t s390rtc_devclass;
-DRIVER_MODULE(s35390a, iicbus, s390rtc_driver, s390rtc_devclass, NULL, NULL);
+DRIVER_MODULE(s35390a, iicbus, s390rtc_driver, NULL, NULL);
MODULE_VERSION(s35390a, 1);
MODULE_DEPEND(s35390a, iicbus, 1, 1, 1);
diff --git a/sys/dev/iicbus/sy8106a.c b/sys/dev/iicbus/sy8106a.c
index cf83b74ee6ad..1ddd10f303cd 100644
--- a/sys/dev/iicbus/sy8106a.c
+++ b/sys/dev/iicbus/sy8106a.c
@@ -293,10 +293,7 @@ static driver_t sy8106a_driver = {
sizeof(struct sy8106a_softc),
};
-static devclass_t sy8106a_devclass;
-
-EARLY_DRIVER_MODULE(sy8106a, iicbus, sy8106a_driver, sy8106a_devclass, 0, 0,
- BUS_PASS_RESOURCE);
+EARLY_DRIVER_MODULE(sy8106a, iicbus, sy8106a_driver, 0, 0, BUS_PASS_RESOURCE);
MODULE_VERSION(sy8106a, 1);
MODULE_DEPEND(sy8106a, iicbus, 1, 1, 1);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/syr827.c b/sys/dev/iicbus/syr827.c
index ba3cf82457d7..f82319a24d72 100644
--- a/sys/dev/iicbus/syr827.c
+++ b/sys/dev/iicbus/syr827.c
@@ -317,10 +317,7 @@ static driver_t syr827_driver = {
sizeof(struct syr827_softc),
};
-static devclass_t syr827_devclass;
-
-EARLY_DRIVER_MODULE(syr827, iicbus, syr827_driver, syr827_devclass, 0, 0,
- BUS_PASS_RESOURCE);
+EARLY_DRIVER_MODULE(syr827, iicbus, syr827_driver, 0, 0, BUS_PASS_RESOURCE);
MODULE_VERSION(syr827, 1);
MODULE_DEPEND(syr827, iicbus, 1, 1, 1);
IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/tmp461.c b/sys/dev/iicbus/tmp461.c
index a9ffd01f7073..3956ca6d4c21 100644
--- a/sys/dev/iicbus/tmp461.c
+++ b/sys/dev/iicbus/tmp461.c
@@ -79,14 +79,12 @@ static driver_t tmp461_driver = {
0
};
-static devclass_t tmp461_devclass;
-
static struct ofw_compat_data tmp461_compat_data[] = {
{ "ti,tmp461", 1 },
{ NULL, 0 }
};
-DRIVER_MODULE(tmp461, iicbus, tmp461_driver, tmp461_devclass, 0, 0);
+DRIVER_MODULE(tmp461, iicbus, tmp461_driver, 0, 0);
IICBUS_FDT_PNP_INFO(tmp461_compat_data);
static int
diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/twsi/a10_twsi.c
index b1f1b1e770c9..dece67921c3c 100644
--- a/sys/dev/iicbus/twsi/a10_twsi.c
+++ b/sys/dev/iicbus/twsi/a10_twsi.c
@@ -147,9 +147,7 @@ static device_method_t a10_twsi_methods[] = {
DEFINE_CLASS_1(iichb, a10_twsi_driver, a10_twsi_methods,
sizeof(struct twsi_softc), twsi_driver);
-static devclass_t a10_twsi_devclass;
-
-EARLY_DRIVER_MODULE(a10_twsi, simplebus, a10_twsi_driver, a10_twsi_devclass,
+EARLY_DRIVER_MODULE(a10_twsi, simplebus, a10_twsi_driver,
0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
EARLY_DRIVER_MODULE(iicbus, a10_twsi, iicbus_driver,
0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/twsi/mv_twsi.c
index 6238911eea61..2b4724d266cc 100644
--- a/sys/dev/iicbus/twsi/mv_twsi.c
+++ b/sys/dev/iicbus/twsi/mv_twsi.c
@@ -118,9 +118,7 @@ static device_method_t mv_twsi_methods[] = {
DEFINE_CLASS_1(twsi, mv_twsi_driver, mv_twsi_methods,
sizeof(struct twsi_softc), twsi_driver);
-static devclass_t mv_twsi_devclass;
-
-DRIVER_MODULE(twsi, simplebus, mv_twsi_driver, mv_twsi_devclass, 0, 0);
+DRIVER_MODULE(twsi, simplebus, mv_twsi_driver, 0, 0);
DRIVER_MODULE(iicbus, twsi, iicbus_driver, 0, 0);
MODULE_DEPEND(twsi, iicbus, 1, 1, 1);
SIMPLEBUS_PNP_INFO(compat_data);