git: 5f31d14a9235 - main - Remove unused spibus_devclass and ofw_spibus_devclass.

The branch main has been updated by jhb:

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

commit 5f31d14a92353b6b0acf6960511b3acf3911d163
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-09 19:22:00 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-09 19:22:00 +0000

    Remove unused spibus_devclass and ofw_spibus_devclass.
---
 sys/arm/allwinner/aw_spi.c      | 2 +-
 sys/arm/freescale/imx/imx_spi.c | 2 +-
 sys/arm/xilinx/zy7_qspi.c       | 2 +-
 sys/arm/xilinx/zy7_spi.c        | 2 +-
 sys/arm64/rockchip/rk_spi.c     | 2 +-
 sys/dev/gpio/gpiospi.c          | 2 +-
 sys/dev/qcom_qup/qcom_spi.c     | 3 +--
 sys/dev/spibus/ofw_spibus.c     | 4 +---
 sys/dev/spibus/spibus.c         | 4 +---
 sys/dev/spibus/spibusvar.h      | 2 --
 sys/riscv/sifive/sifive_spi.c   | 2 +-
 11 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/sys/arm/allwinner/aw_spi.c b/sys/arm/allwinner/aw_spi.c
index 0f5cee8769de..bdc855cff801 100644
--- a/sys/arm/allwinner/aw_spi.c
+++ b/sys/arm/allwinner/aw_spi.c
@@ -612,6 +612,6 @@ static driver_t aw_spi_driver = {
 static devclass_t aw_spi_devclass;
 
 DRIVER_MODULE(aw_spi, simplebus, aw_spi_driver, aw_spi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, aw_spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, aw_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(aw_spi, ofw_spibus, 1, 1, 1);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/freescale/imx/imx_spi.c b/sys/arm/freescale/imx/imx_spi.c
index 6624955ff124..127cfa905a7a 100644
--- a/sys/arm/freescale/imx/imx_spi.c
+++ b/sys/arm/freescale/imx/imx_spi.c
@@ -606,6 +606,6 @@ static driver_t spi_driver = {
 static devclass_t spi_devclass;
 
 DRIVER_MODULE(imx_spi, simplebus, spi_driver, spi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, imx_spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, imx_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(imx_spi, ofw_spibus, 1, 1, 1);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c
index e94c93db1e36..f64e6be555a0 100644
--- a/sys/arm/xilinx/zy7_qspi.c
+++ b/sys/arm/xilinx/zy7_qspi.c
@@ -749,6 +749,6 @@ static driver_t zy7_qspi_driver = {
 static devclass_t zy7_qspi_devclass;
 
 DRIVER_MODULE(zy7_qspi, simplebus, zy7_qspi_driver, zy7_qspi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, zy7_qspi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, zy7_qspi, ofw_spibus_driver, 0, 0);
 SIMPLEBUS_PNP_INFO(compat_data);
 MODULE_DEPEND(zy7_qspi, ofw_spibus, 1, 1, 1);
diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c
index 2f8edfedf7f1..e3d04fd1632c 100644
--- a/sys/arm/xilinx/zy7_spi.c
+++ b/sys/arm/xilinx/zy7_spi.c
@@ -591,6 +591,6 @@ static driver_t zy7_spi_driver = {
 static devclass_t zy7_spi_devclass;
 
 DRIVER_MODULE(zy7_spi, simplebus, zy7_spi_driver, zy7_spi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, zy7_spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, zy7_spi, ofw_spibus_driver, 0, 0);
 SIMPLEBUS_PNP_INFO(compat_data);
 MODULE_DEPEND(zy7_spi, ofw_spibus, 1, 1, 1);
diff --git a/sys/arm64/rockchip/rk_spi.c b/sys/arm64/rockchip/rk_spi.c
index 4df1208f40aa..f0db4c70b895 100644
--- a/sys/arm64/rockchip/rk_spi.c
+++ b/sys/arm64/rockchip/rk_spi.c
@@ -479,6 +479,6 @@ static driver_t rk_spi_driver = {
 static devclass_t rk_spi_devclass;
 
 DRIVER_MODULE(rk_spi, simplebus, rk_spi_driver, rk_spi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, rk_spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, rk_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(rk_spi, ofw_spibus, 1, 1, 1);
 OFWBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/gpio/gpiospi.c b/sys/dev/gpio/gpiospi.c
index 840241385bfc..92bf073ff66d 100644
--- a/sys/dev/gpio/gpiospi.c
+++ b/sys/dev/gpio/gpiospi.c
@@ -399,6 +399,6 @@ static driver_t gpio_spi_driver = {
 static devclass_t gpio_spi_devclass;
 
 DRIVER_MODULE(gpiospi, gpiobus, gpio_spi_driver, gpio_spi_devclass, 0, 0);
-DRIVER_MODULE(spibus, gpiospi, spibus_driver, spibus_devclass, 0, 0);
+DRIVER_MODULE(spibus, gpiospi, spibus_driver, 0, 0);
 MODULE_DEPEND(spi, gpiospi, 1, 1, 1);
 MODULE_DEPEND(gpiobus, gpiospi, 1, 1, 1);
diff --git a/sys/dev/qcom_qup/qcom_spi.c b/sys/dev/qcom_qup/qcom_spi.c
index e16a03db46dc..706bef242043 100644
--- a/sys/dev/qcom_qup/qcom_spi.c
+++ b/sys/dev/qcom_qup/qcom_spi.c
@@ -905,7 +905,6 @@ static driver_t qcom_spi_driver = {
 static devclass_t qcom_spi_devclass;
 
 DRIVER_MODULE(qcom_spi, simplebus, qcom_spi_driver, qcom_spi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, qcom_spi, ofw_spibus_driver, ofw_spibus_devclass,
-    0, 0);
+DRIVER_MODULE(ofw_spibus, qcom_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(qcom_spi, ofw_spibus, 1, 1, 1);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/spibus/ofw_spibus.c b/sys/dev/spibus/ofw_spibus.c
index 7aae7f44b034..237a4c44d329 100644
--- a/sys/dev/spibus/ofw_spibus.c
+++ b/sys/dev/spibus/ofw_spibus.c
@@ -232,10 +232,8 @@ static device_method_t ofw_spibus_methods[] = {
 	DEVMETHOD_END
 };
 
-devclass_t ofw_spibus_devclass;
-
 DEFINE_CLASS_1(spibus, ofw_spibus_driver, ofw_spibus_methods,
     sizeof(struct spibus_softc), spibus_driver);
-DRIVER_MODULE(ofw_spibus, spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, spi, ofw_spibus_driver, 0, 0);
 MODULE_VERSION(ofw_spibus, 1);
 MODULE_DEPEND(ofw_spibus, spibus, 1, 1, 1);
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
index f9392131e7b6..b0b2b5eb73ad 100644
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -276,7 +276,5 @@ driver_t spibus_driver = {
 	sizeof(struct spibus_softc)
 };
 
-devclass_t	spibus_devclass;
-
-DRIVER_MODULE(spibus, spi, spibus_driver, spibus_devclass, 0, 0);
+DRIVER_MODULE(spibus, spi, spibus_driver, 0, 0);
 MODULE_VERSION(spibus, 1);
diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h
index 9c6042c7fcb2..58a7bf784787 100644
--- a/sys/dev/spibus/spibusvar.h
+++ b/sys/dev/spibus/spibusvar.h
@@ -73,6 +73,4 @@ SPIBUS_ACCESSOR(mode,		MODE,		uint32_t)
 SPIBUS_ACCESSOR(clock,		CLOCK,		uint32_t)
 
 extern driver_t spibus_driver;
-extern devclass_t spibus_devclass;
 extern driver_t ofw_spibus_driver;
-extern devclass_t ofw_spibus_devclass;
diff --git a/sys/riscv/sifive/sifive_spi.c b/sys/riscv/sifive/sifive_spi.c
index 4a5d79fec01d..dd2cc3f58ee8 100644
--- a/sys/riscv/sifive/sifive_spi.c
+++ b/sys/riscv/sifive/sifive_spi.c
@@ -401,5 +401,5 @@ static driver_t sfspi_driver = {
 static devclass_t sfspi_devclass;
 
 DRIVER_MODULE(sifive_spi, simplebus, sfspi_driver, sfspi_devclass, 0, 0);
-DRIVER_MODULE(ofw_spibus, sifive_spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, sifive_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(sifive_spi, ofw_spibus, 1, 1, 1);