git: 676ea8e1778d - main - Remove unused iicbus_devclass.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 22:43:25 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=676ea8e1778d671703c8901ea82ad4092b00b24a
commit 676ea8e1778d671703c8901ea82ad4092b00b24a
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-20 16:19:37 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:39:30 +0000
Remove unused iicbus_devclass.
---
sys/arm/allwinner/aw_rsb.c | 2 +-
sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 2 +-
sys/arm/freescale/vybrid/vf_i2c.c | 2 +-
sys/arm/mv/a37x0_iic.c | 2 +-
sys/arm/ti/ti_i2c.c | 2 +-
sys/compat/linuxkpi/common/src/linux_i2c.c | 2 +-
sys/dev/glxiic/glxiic.c | 2 +-
sys/dev/ichiic/ig4_iic.c | 5 ++---
sys/dev/iicbus/iicbb.c | 2 +-
sys/dev/iicbus/iicbus.c | 4 +---
sys/dev/iicbus/iicbus.h | 1 -
sys/dev/iicbus/iicoc.c | 2 +-
sys/dev/iicbus/mux/iic_gpiomux.c | 2 +-
sys/dev/iicbus/mux/ltc430x.c | 2 +-
sys/dev/iicbus/mux/pca9547.c | 2 +-
sys/dev/iicbus/mux/pca954x.c | 2 +-
sys/dev/iicbus/pmic/rockchip/rk805.c | 2 +-
sys/dev/iicbus/pmic/rockchip/rk808.c | 2 +-
sys/dev/iicbus/twsi/a10_twsi.c | 2 +-
sys/dev/iicbus/twsi/mv_twsi.c | 2 +-
sys/dev/pcf/pcf.c | 2 +-
sys/powerpc/mpc85xx/i2c.c | 2 +-
sys/powerpc/powernv/opal_i2c.c | 2 +-
23 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/sys/arm/allwinner/aw_rsb.c b/sys/arm/allwinner/aw_rsb.c
index e6714107d7b4..504f3aa0cd1c 100644
--- a/sys/arm/allwinner/aw_rsb.c
+++ b/sys/arm/allwinner/aw_rsb.c
@@ -503,7 +503,7 @@ static driver_t rsb_driver = {
static devclass_t rsb_devclass;
-EARLY_DRIVER_MODULE(iicbus, rsb, iicbus_driver, iicbus_devclass, 0, 0,
+EARLY_DRIVER_MODULE(iicbus, rsb, iicbus_driver, 0, 0,
BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
EARLY_DRIVER_MODULE(rsb, simplebus, rsb_driver, rsb_devclass, 0, 0,
BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
index 7c24d6a5959c..652c25957983 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
@@ -723,5 +723,5 @@ static driver_t bcm_bsc_driver = {
sizeof(struct bcm_bsc_softc),
};
-DRIVER_MODULE(iicbus, bcm2835_bsc, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, bcm2835_bsc, iicbus_driver, 0, 0);
DRIVER_MODULE(bcm2835_bsc, simplebus, bcm_bsc_driver, bcm_bsc_devclass, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index ba2a72fb2757..8cb81d3b0db7 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -610,5 +610,5 @@ static device_method_t i2c_methods[] = {
static devclass_t i2c_devclass;
static DEFINE_CLASS_0(i2c, i2c_driver, i2c_methods, sizeof(struct i2c_softc));
DRIVER_MODULE(vybrid_i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
-DRIVER_MODULE(iicbus, i2c, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, i2c, iicbus_driver, 0, 0);
DRIVER_MODULE(ofw_iicbus, i2c, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0);
diff --git a/sys/arm/mv/a37x0_iic.c b/sys/arm/mv/a37x0_iic.c
index 041b2b1678dd..b92506c6dcad 100644
--- a/sys/arm/mv/a37x0_iic.c
+++ b/sys/arm/mv/a37x0_iic.c
@@ -480,5 +480,5 @@ static driver_t a37x0_iic_driver = {
sizeof(struct a37x0_iic_softc),
};
-DRIVER_MODULE(iicbus, a37x0_iic, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, a37x0_iic, iicbus_driver, 0, 0);
DRIVER_MODULE(a37x0_iic, simplebus, a37x0_iic_driver, a37x0_iic_devclass, 0, 0);
diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c
index c9b27436547c..88845ffca853 100644
--- a/sys/arm/ti/ti_i2c.c
+++ b/sys/arm/ti/ti_i2c.c
@@ -971,7 +971,7 @@ static driver_t ti_i2c_driver = {
static devclass_t ti_i2c_devclass;
DRIVER_MODULE(ti_iic, simplebus, ti_i2c_driver, ti_i2c_devclass, 0, 0);
-DRIVER_MODULE(iicbus, ti_iic, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, ti_iic, iicbus_driver, 0, 0);
MODULE_DEPEND(ti_iic, ti_sysc, 1, 1, 1);
MODULE_DEPEND(ti_iic, iicbus, 1, 1, 1);
diff --git a/sys/compat/linuxkpi/common/src/linux_i2c.c b/sys/compat/linuxkpi/common/src/linux_i2c.c
index 2b68664642da..41edb118af5e 100644
--- a/sys/compat/linuxkpi/common/src/linux_i2c.c
+++ b/sys/compat/linuxkpi/common/src/linux_i2c.c
@@ -126,7 +126,7 @@ driver_t lkpi_iic_driver = {
};
DRIVER_MODULE(lkpi_iic, drmn, lkpi_iic_driver, lkpi_iic_devclass, 0, 0);
-DRIVER_MODULE(iicbus, lkpi_iic, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, lkpi_iic, iicbus_driver, 0, 0);
MODULE_DEPEND(linuxkpi, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
static int
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index e742812824df..a26e03389ea2 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -279,7 +279,7 @@ static driver_t glxiic_driver = {
static devclass_t glxiic_devclass;
DRIVER_MODULE(glxiic, isab, glxiic_driver, glxiic_devclass, 0, 0);
-DRIVER_MODULE(iicbus, glxiic, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, glxiic, iicbus_driver, 0, 0);
MODULE_DEPEND(glxiic, iicbus, 1, 1, 1);
static void
diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c
index 12a103fc20d5..c181d617bf48 100644
--- a/sys/dev/ichiic/ig4_iic.c
+++ b/sys/dev/ichiic/ig4_iic.c
@@ -1212,10 +1212,9 @@ ig4iic_dump(ig4iic_softc_t *sc)
devclass_t ig4iic_devclass;
-DRIVER_MODULE(iicbus, ig4iic, iicbus_driver, iicbus_devclass, NULL, NULL);
+DRIVER_MODULE(iicbus, ig4iic, iicbus_driver, NULL, NULL);
#ifdef DEV_ACPI
-DRIVER_MODULE(acpi_iicbus, ig4iic, acpi_iicbus_driver, iicbus_devclass, NULL,
- NULL);
+DRIVER_MODULE(acpi_iicbus, ig4iic, acpi_iicbus_driver, NULL, NULL);
#endif
MODULE_DEPEND(ig4iic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(ig4iic, 1);
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index f190ff81f199..6ecd3e19f4ed 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -593,7 +593,7 @@ iicbb_set_speed(struct iicbb_softc *sc, u_char speed)
sc->udelay = MAX(period, 1);
}
-DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, iicbb, iicbus_driver, 0, 0);
MODULE_DEPEND(iicbb, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(iicbb, IICBB_MODVER);
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index dd6b484e395b..4ecdda75767b 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -383,7 +383,5 @@ driver_t iicbus_driver = {
sizeof(struct iicbus_softc),
};
-devclass_t iicbus_devclass;
-
MODULE_VERSION(iicbus, IICBUS_MODVER);
-DRIVER_MODULE(iicbus, iichb, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, iichb, iicbus_driver, 0, 0);
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index ec4f841395d5..5c7880bcfd13 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -99,7 +99,6 @@ int iicbus_child_location(device_t bus, device_t child, struct sbuf *sb);
int iicbus_child_pnpinfo(device_t bus, device_t child, struct sbuf *sb);
extern driver_t iicbus_driver;
-extern devclass_t iicbus_devclass;
extern driver_t ofw_iicbus_driver;
extern devclass_t ofw_iicbus_devclass;
extern driver_t acpi_iicbus_driver;
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/iicoc.c
index f22878224c32..2284bbf8cc27 100644
--- a/sys/dev/iicbus/iicoc.c
+++ b/sys/dev/iicbus/iicoc.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
devclass_t iicoc_devclass;
-DRIVER_MODULE(iicbus, iicoc, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, iicoc, iicbus_driver, 0, 0);
static void
iicoc_dev_write(device_t dev, int reg, int value)
diff --git a/sys/dev/iicbus/mux/iic_gpiomux.c b/sys/dev/iicbus/mux/iic_gpiomux.c
index 8e064d84619d..4416738b6483 100644
--- a/sys/dev/iicbus/mux/iic_gpiomux.c
+++ b/sys/dev/iicbus/mux/iic_gpiomux.c
@@ -260,7 +260,7 @@ DRIVER_MODULE(iic_gpiomux, ofw_simplebus, iic_gpiomux_driver, gpiomux_devclass,
#ifdef FDT
DRIVER_MODULE(ofw_iicbus, iic_gpiomux, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0);
#else
-DRIVER_MODULE(iicbus, iic_gpiomux, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, iic_gpiomux, iicbus_driver, 0, 0);
#endif
MODULE_DEPEND(iic_gpiomux, iicmux, 1, 1, 1);
diff --git a/sys/dev/iicbus/mux/ltc430x.c b/sys/dev/iicbus/mux/ltc430x.c
index fab791ed3174..9abf0a6718d3 100644
--- a/sys/dev/iicbus/mux/ltc430x.c
+++ b/sys/dev/iicbus/mux/ltc430x.c
@@ -250,7 +250,7 @@ DRIVER_MODULE(ltc430x, iicbus, ltc430x_driver, ltc430x_devclass, 0, 0);
#ifdef FDT
DRIVER_MODULE(ofw_iicbus, ltc430x, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0);
#else
-DRIVER_MODULE(iicbus, ltc430x, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, ltc430x, iicbus_driver, 0, 0);
#endif
MODULE_DEPEND(ltc430x, iicmux, 1, 1, 1);
diff --git a/sys/dev/iicbus/mux/pca9547.c b/sys/dev/iicbus/mux/pca9547.c
index ac57f26dbb04..ad6a82bb7015 100644
--- a/sys/dev/iicbus/mux/pca9547.c
+++ b/sys/dev/iicbus/mux/pca9547.c
@@ -155,7 +155,7 @@ 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(iicbus, iicmux, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, iicmux, iicbus_driver, 0, 0);
DRIVER_MODULE(ofw_iicbus, iicmux, ofw_iicbus_driver, ofw_iicbus_devclass,
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 44c81539691e..444b0d02fb39 100644
--- a/sys/dev/iicbus/mux/pca954x.c
+++ b/sys/dev/iicbus/mux/pca954x.c
@@ -202,7 +202,7 @@ DRIVER_MODULE(pca9548, iicbus, pca954x_driver, pca954x_devclass, 0, 0);
#ifdef FDT
DRIVER_MODULE(ofw_iicbus, pca9548, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0);
#else
-DRIVER_MODULE(iicbus, pca9548, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, pca9548, iicbus_driver, 0, 0);
#endif
MODULE_DEPEND(pca9548, iicmux, 1, 1, 1);
diff --git a/sys/dev/iicbus/pmic/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c
index b3182d4909a6..0a4745602507 100644
--- a/sys/dev/iicbus/pmic/rockchip/rk805.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk805.c
@@ -196,7 +196,7 @@ static devclass_t rk805_devclass;
EARLY_DRIVER_MODULE(rk805_pmu, iicbus, rk805_driver, rk805_devclass, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
-EARLY_DRIVER_MODULE(iicbus, rk805_pmu, iicbus_driver, iicbus_devclass, 0, 0,
+EARLY_DRIVER_MODULE(iicbus, rk805_pmu, iicbus_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
MODULE_DEPEND(rk805_pmu, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(rk805_pmu, 1);
diff --git a/sys/dev/iicbus/pmic/rockchip/rk808.c b/sys/dev/iicbus/pmic/rockchip/rk808.c
index b9214fc74b61..056de8debcdf 100644
--- a/sys/dev/iicbus/pmic/rockchip/rk808.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk808.c
@@ -271,7 +271,7 @@ static devclass_t rk808_devclass;
EARLY_DRIVER_MODULE(rk808_pmu, iicbus, rk808_driver, rk808_devclass, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
-EARLY_DRIVER_MODULE(iicbus, rk808_pmu, iicbus_driver, iicbus_devclass, 0, 0,
+EARLY_DRIVER_MODULE(iicbus, rk808_pmu, iicbus_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
MODULE_DEPEND(rk808_pmu, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(rk808_pmu, 1);
diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/twsi/a10_twsi.c
index 7554db0fbc94..b1f1b1e770c9 100644
--- a/sys/dev/iicbus/twsi/a10_twsi.c
+++ b/sys/dev/iicbus/twsi/a10_twsi.c
@@ -151,7 +151,7 @@ static devclass_t a10_twsi_devclass;
EARLY_DRIVER_MODULE(a10_twsi, simplebus, a10_twsi_driver, a10_twsi_devclass,
0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
-EARLY_DRIVER_MODULE(iicbus, a10_twsi, iicbus_driver, iicbus_devclass,
+EARLY_DRIVER_MODULE(iicbus, a10_twsi, iicbus_driver,
0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
MODULE_DEPEND(a10_twsi, iicbus, 1, 1, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/twsi/mv_twsi.c
index 7ad6ee68827f..6238911eea61 100644
--- a/sys/dev/iicbus/twsi/mv_twsi.c
+++ b/sys/dev/iicbus/twsi/mv_twsi.c
@@ -121,7 +121,7 @@ DEFINE_CLASS_1(twsi, mv_twsi_driver, mv_twsi_methods,
static devclass_t mv_twsi_devclass;
DRIVER_MODULE(twsi, simplebus, mv_twsi_driver, mv_twsi_devclass, 0, 0);
-DRIVER_MODULE(iicbus, twsi, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, twsi, iicbus_driver, 0, 0);
MODULE_DEPEND(twsi, iicbus, 1, 1, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index c91a3332d655..61852ab7d4f0 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -478,6 +478,6 @@ error:
return (error);
}
-DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, pcf, iicbus_driver, 0, 0);
MODULE_DEPEND(pcf, iicbus, PCF_MINVER, PCF_PREFVER, PCF_MAXVER);
MODULE_VERSION(pcf, PCF_MODVER);
diff --git a/sys/powerpc/mpc85xx/i2c.c b/sys/powerpc/mpc85xx/i2c.c
index 390e492b2d0b..f96fc6a53f43 100644
--- a/sys/powerpc/mpc85xx/i2c.c
+++ b/sys/powerpc/mpc85xx/i2c.c
@@ -125,7 +125,7 @@ static driver_t i2c_driver = {
static devclass_t i2c_devclass;
DRIVER_MODULE(i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
-DRIVER_MODULE(iicbus, i2c, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(iicbus, i2c, iicbus_driver, 0, 0);
static __inline void
i2c_write_reg(struct i2c_softc *sc, bus_size_t off, uint8_t val)
diff --git a/sys/powerpc/powernv/opal_i2c.c b/sys/powerpc/powernv/opal_i2c.c
index 8478361f8b6a..9e387cb29f4b 100644
--- a/sys/powerpc/powernv/opal_i2c.c
+++ b/sys/powerpc/powernv/opal_i2c.c
@@ -247,5 +247,5 @@ opal_i2c_get_node(device_t bus, device_t dev)
DRIVER_MODULE(opal_i2c, opal_i2cm, opal_i2c_driver, opal_i2c_devclass, NULL,
NULL);
-DRIVER_MODULE(iicbus, opal_i2c, iicbus_driver, iicbus_devclass, NULL, NULL);
+DRIVER_MODULE(iicbus, opal_i2c, iicbus_driver, NULL, NULL);
MODULE_DEPEND(opal_i2c, iicbus, 1, 1, 1);