Date: Fri, 6 May 2022 22:43:26 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 85447c525b75 - main - Remove unused ofw_iicbus_devclass. Message-ID: <202205062243.246MhQD5019682@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=85447c525b755fa3e968ae617174478c5cfe1fc6 commit 85447c525b755fa3e968ae617174478c5cfe1fc6 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-04-20 16:21:45 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:39:30 +0000 Remove unused ofw_iicbus_devclass. --- sys/arm/freescale/imx/imx_i2c.c | 2 +- sys/arm/freescale/vybrid/vf_i2c.c | 2 +- sys/arm64/rockchip/rk_i2c.c | 2 +- sys/dev/iicbus/iicbus.h | 1 - sys/dev/iicbus/iicoc_fdt.c | 2 +- sys/dev/iicbus/mux/iic_gpiomux.c | 2 +- sys/dev/iicbus/mux/ltc430x.c | 2 +- sys/dev/iicbus/mux/pca9547.c | 3 +-- sys/dev/iicbus/mux/pca954x.c | 2 +- sys/dev/iicbus/ofw_iicbus.c | 11 +++-------- 10 files changed, 11 insertions(+), 18 deletions(-) diff --git a/sys/arm/freescale/imx/imx_i2c.c b/sys/arm/freescale/imx/imx_i2c.c index c3eb5f8b4e2f..714e6519d940 100644 --- a/sys/arm/freescale/imx/imx_i2c.c +++ b/sys/arm/freescale/imx/imx_i2c.c @@ -203,7 +203,7 @@ static driver_t i2c_driver = { static devclass_t i2c_devclass; DRIVER_MODULE(imx_i2c, simplebus, i2c_driver, i2c_devclass, 0, 0); -DRIVER_MODULE(ofw_iicbus, imx_i2c, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0); +DRIVER_MODULE(ofw_iicbus, imx_i2c, ofw_iicbus_driver, 0, 0); MODULE_DEPEND(imx_i2c, iicbus, 1, 1, 1); SIMPLEBUS_PNP_INFO(compat_data); diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c index 8cb81d3b0db7..05533230bc22 100644 --- a/sys/arm/freescale/vybrid/vf_i2c.c +++ b/sys/arm/freescale/vybrid/vf_i2c.c @@ -611,4 +611,4 @@ 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, 0, 0); -DRIVER_MODULE(ofw_iicbus, i2c, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0); +DRIVER_MODULE(ofw_iicbus, i2c, ofw_iicbus_driver, 0, 0); diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index ffe6f17ee0ac..d1b38158bf37 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -730,7 +730,7 @@ static devclass_t rk_i2c_devclass; EARLY_DRIVER_MODULE(rk_i2c, simplebus, rk_i2c_driver, rk_i2c_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); -EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, ofw_iicbus_devclass, +EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk_i2c, iicbus, 1, 1, 1); MODULE_VERSION(rk_i2c, 1); diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h index 5c7880bcfd13..86cf83d078f1 100644 --- a/sys/dev/iicbus/iicbus.h +++ b/sys/dev/iicbus/iicbus.h @@ -100,7 +100,6 @@ int iicbus_child_pnpinfo(device_t bus, device_t child, struct sbuf *sb); extern driver_t iicbus_driver; extern driver_t ofw_iicbus_driver; -extern devclass_t ofw_iicbus_devclass; extern driver_t acpi_iicbus_driver; #endif diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/iicoc_fdt.c index 0bc25044a293..59f256f0676f 100644 --- a/sys/dev/iicbus/iicoc_fdt.c +++ b/sys/dev/iicbus/iicoc_fdt.c @@ -187,6 +187,6 @@ static driver_t iicoc_driver = { SIMPLEBUS_PNP_INFO(compat_data); DRIVER_MODULE(iicoc, simplebus, iicoc_driver, iicoc_devclass, 0, 0); -DRIVER_MODULE(ofw_iicbus, iicoc, ofw_iicbus_driver, ofw_iicbus_devclass, 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/mux/iic_gpiomux.c b/sys/dev/iicbus/mux/iic_gpiomux.c index 4416738b6483..9184aa83f766 100644 --- a/sys/dev/iicbus/mux/iic_gpiomux.c +++ b/sys/dev/iicbus/mux/iic_gpiomux.c @@ -258,7 +258,7 @@ 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); #ifdef FDT -DRIVER_MODULE(ofw_iicbus, iic_gpiomux, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0); +DRIVER_MODULE(ofw_iicbus, iic_gpiomux, ofw_iicbus_driver, 0, 0); #else DRIVER_MODULE(iicbus, iic_gpiomux, iicbus_driver, 0, 0); #endif diff --git a/sys/dev/iicbus/mux/ltc430x.c b/sys/dev/iicbus/mux/ltc430x.c index 9abf0a6718d3..d19b33f525f5 100644 --- a/sys/dev/iicbus/mux/ltc430x.c +++ b/sys/dev/iicbus/mux/ltc430x.c @@ -248,7 +248,7 @@ DEFINE_CLASS_1(ltc430x, ltc430x_driver, ltc430x_methods, 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); +DRIVER_MODULE(ofw_iicbus, ltc430x, ofw_iicbus_driver, 0, 0); #else DRIVER_MODULE(iicbus, ltc430x, iicbus_driver, 0, 0); #endif diff --git a/sys/dev/iicbus/mux/pca9547.c b/sys/dev/iicbus/mux/pca9547.c index ad6a82bb7015..76ccede29a5c 100644 --- a/sys/dev/iicbus/mux/pca9547.c +++ b/sys/dev/iicbus/mux/pca9547.c @@ -156,7 +156,6 @@ 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, 0, 0); -DRIVER_MODULE(ofw_iicbus, iicmux, ofw_iicbus_driver, ofw_iicbus_devclass, - 0, 0); +DRIVER_MODULE(ofw_iicbus, iicmux, ofw_iicbus_driver, 0, 0); MODULE_DEPEND(pca9547, iicmux, 1, 1, 1); MODULE_DEPEND(pca9547, iicbus, 1, 1, 1); diff --git a/sys/dev/iicbus/mux/pca954x.c b/sys/dev/iicbus/mux/pca954x.c index 444b0d02fb39..3a0d416d1f6e 100644 --- a/sys/dev/iicbus/mux/pca954x.c +++ b/sys/dev/iicbus/mux/pca954x.c @@ -200,7 +200,7 @@ DEFINE_CLASS_1(pca9548, pca954x_driver, pca954x_methods, 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); +DRIVER_MODULE(ofw_iicbus, pca9548, ofw_iicbus_driver, 0, 0); #else DRIVER_MODULE(iicbus, pca9548, iicbus_driver, 0, 0); #endif diff --git a/sys/dev/iicbus/ofw_iicbus.c b/sys/dev/iicbus/ofw_iicbus.c index 8449e6429b96..0c45df24e9c9 100644 --- a/sys/dev/iicbus/ofw_iicbus.c +++ b/sys/dev/iicbus/ofw_iicbus.c @@ -82,16 +82,11 @@ struct ofw_iicbus_devinfo { struct ofw_bus_devinfo opd_obdinfo; }; -devclass_t ofw_iicbus_devclass; - DEFINE_CLASS_1(iicbus, ofw_iicbus_driver, ofw_iicbus_methods, sizeof(struct iicbus_softc), iicbus_driver); -EARLY_DRIVER_MODULE(ofw_iicbus, iicbb, ofw_iicbus_driver, ofw_iicbus_devclass, - 0, 0, BUS_PASS_BUS); -EARLY_DRIVER_MODULE(ofw_iicbus, iichb, ofw_iicbus_driver, ofw_iicbus_devclass, - 0, 0, BUS_PASS_BUS); -EARLY_DRIVER_MODULE(ofw_iicbus, twsi, ofw_iicbus_driver, ofw_iicbus_devclass, - 0, 0, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_iicbus, iicbb, ofw_iicbus_driver, 0, 0, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_iicbus, iichb, ofw_iicbus_driver, 0, 0, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_iicbus, twsi, ofw_iicbus_driver, 0, 0, BUS_PASS_BUS); MODULE_VERSION(ofw_iicbus, 1); MODULE_DEPEND(ofw_iicbus, iicbus, 1, 1, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205062243.246MhQD5019682>