Date: Mon, 9 May 2022 19:22:40 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: 84c5f982effa - main - gpio: Remove unused devclass arguments to DRIVER_MODULE. Message-ID: <202205091922.249JMea0085166@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=84c5f982effaf49a91a2f3e5a8fd4f56bdf4f3b3 commit 84c5f982effaf49a91a2f3e5a8fd4f56bdf4f3b3 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-09 19:22:01 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-09 19:22:01 +0000 gpio: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/gpio/bytgpio.c | 3 +-- sys/dev/gpio/chvgpio.c | 3 +-- sys/dev/gpio/dwgpio/dwgpio.c | 5 +---- sys/dev/gpio/dwgpio/dwgpio_bus.c | 6 ++---- sys/dev/gpio/gpiobacklight.c | 5 +---- sys/dev/gpio/gpiobus.c | 4 +--- sys/dev/gpio/gpioiic.c | 6 ++---- sys/dev/gpio/gpiokeys.c | 4 +--- sys/dev/gpio/gpioled.c | 4 +--- sys/dev/gpio/gpioled_fdt.c | 6 ++---- sys/dev/gpio/gpiomdio.c | 6 ++---- sys/dev/gpio/gpiopower.c | 4 +--- sys/dev/gpio/gpiopps.c | 4 +--- sys/dev/gpio/gpioregulator.c | 6 ++---- sys/dev/gpio/gpiospi.c | 4 +--- sys/dev/gpio/gpioths.c | 6 ++---- sys/dev/gpio/pl061_acpi.c | 4 +--- sys/dev/gpio/pl061_fdt.c | 4 +--- sys/dev/gpio/qoriq_gpio.c | 5 +---- sys/dev/nctgpio/nctgpio.c | 4 +--- sys/dev/rccgpio/rccgpio.c | 4 +--- 21 files changed, 27 insertions(+), 70 deletions(-) diff --git a/sys/dev/gpio/bytgpio.c b/sys/dev/gpio/bytgpio.c index 0727f767c920..7834a45d65db 100644 --- a/sys/dev/gpio/bytgpio.c +++ b/sys/dev/gpio/bytgpio.c @@ -674,7 +674,6 @@ static driver_t bytgpio_driver = { sizeof(struct bytgpio_softc), }; -static devclass_t bytgpio_devclass; -DRIVER_MODULE(bytgpio, acpi, bytgpio_driver, bytgpio_devclass, 0, 0); +DRIVER_MODULE(bytgpio, acpi, bytgpio_driver, 0, 0); MODULE_DEPEND(bytgpio, acpi, 1, 1, 1); MODULE_DEPEND(bytgpio, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/chvgpio.c b/sys/dev/gpio/chvgpio.c index 7b8203687322..fbb239c00b1e 100644 --- a/sys/dev/gpio/chvgpio.c +++ b/sys/dev/gpio/chvgpio.c @@ -517,8 +517,7 @@ static driver_t chvgpio_driver = { .size = sizeof(struct chvgpio_softc) }; -static devclass_t chvgpio_devclass; -DRIVER_MODULE(chvgpio, acpi, chvgpio_driver, chvgpio_devclass, NULL , NULL); +DRIVER_MODULE(chvgpio, acpi, chvgpio_driver, NULL, NULL); MODULE_DEPEND(chvgpio, acpi, 1, 1, 1); MODULE_DEPEND(chvgpio, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/dwgpio/dwgpio.c b/sys/dev/gpio/dwgpio/dwgpio.c index 787ac55cfa18..f642d261b6bf 100644 --- a/sys/dev/gpio/dwgpio/dwgpio.c +++ b/sys/dev/gpio/dwgpio/dwgpio.c @@ -419,7 +419,4 @@ static driver_t dwgpio_driver = { sizeof(struct dwgpio_softc), }; -static devclass_t dwgpio_devclass; - -DRIVER_MODULE(dwgpio, dwgpiobus, dwgpio_driver, - dwgpio_devclass, 0, 0); +DRIVER_MODULE(dwgpio, dwgpiobus, dwgpio_driver, 0, 0); diff --git a/sys/dev/gpio/dwgpio/dwgpio_bus.c b/sys/dev/gpio/dwgpio/dwgpio_bus.c index c6acb39ac65d..4f47848c0c3e 100644 --- a/sys/dev/gpio/dwgpio/dwgpio_bus.c +++ b/sys/dev/gpio/dwgpio/dwgpio_bus.c @@ -159,8 +159,6 @@ static device_method_t dwgpiobus_methods[] = { DEFINE_CLASS_1(dwgpiobus, dwgpiobus_driver, dwgpiobus_methods, sizeof(struct dwgpiobus_softc), simplebus_driver); -static devclass_t dwgpiobus_devclass; - -EARLY_DRIVER_MODULE(dwgpiobus, simplebus, dwgpiobus_driver, dwgpiobus_devclass, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(dwgpiobus, simplebus, dwgpiobus_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(dwgpiobus, 1); diff --git a/sys/dev/gpio/gpiobacklight.c b/sys/dev/gpio/gpiobacklight.c index 48766e8b649c..d0b0499bdb87 100644 --- a/sys/dev/gpio/gpiobacklight.c +++ b/sys/dev/gpio/gpiobacklight.c @@ -150,8 +150,6 @@ gpiobacklight_detach(device_t dev) return (0); } -static devclass_t gpiobacklight_devclass; - static device_method_t gpiobacklight_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpiobacklight_probe), @@ -167,6 +165,5 @@ static driver_t gpiobacklight_driver = { sizeof(struct gpiobacklight_softc), }; -DRIVER_MODULE(gpiobacklight, simplebus, gpiobacklight_driver, - gpiobacklight_devclass, 0, 0); +DRIVER_MODULE(gpiobacklight, simplebus, gpiobacklight_driver, 0, 0); MODULE_DEPEND(gpiobacklight, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 4ed8e14aedb9..b323668d306a 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -1113,8 +1113,6 @@ driver_t gpiobus_driver = { sizeof(struct gpiobus_softc) }; -devclass_t gpiobus_devclass; - -EARLY_DRIVER_MODULE(gpiobus, gpio, gpiobus_driver, gpiobus_devclass, 0, 0, +EARLY_DRIVER_MODULE(gpiobus, gpio, gpiobus_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(gpiobus, 1); diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c index d904ec124b9a..ff6ee3d5ae97 100644 --- a/sys/dev/gpio/gpioiic.c +++ b/sys/dev/gpio/gpioiic.c @@ -340,8 +340,6 @@ gpioiic_detach(device_t dev) return (0); } -static devclass_t gpioiic_devclass; - static device_method_t gpioiic_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpioiic_probe), @@ -369,8 +367,8 @@ static driver_t gpioiic_driver = { sizeof(struct gpioiic_softc), }; -DRIVER_MODULE(gpioiic, gpiobus, gpioiic_driver, gpioiic_devclass, 0, 0); -DRIVER_MODULE(gpioiic, simplebus, gpioiic_driver, gpioiic_devclass, 0, 0); +DRIVER_MODULE(gpioiic, gpiobus, gpioiic_driver, 0, 0); +DRIVER_MODULE(gpioiic, simplebus, gpioiic_driver, 0, 0); DRIVER_MODULE(iicbb, gpioiic, iicbb_driver, 0, 0); MODULE_DEPEND(gpioiic, iicbb, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER); MODULE_DEPEND(gpioiic, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/gpiokeys.c b/sys/dev/gpio/gpiokeys.c index 6fd1edddab44..bea5844bad5e 100644 --- a/sys/dev/gpio/gpiokeys.c +++ b/sys/dev/gpio/gpiokeys.c @@ -1038,8 +1038,6 @@ gpiokeys_driver_load(module_t mod, int what, void *arg) return (0); } -static devclass_t gpiokeys_devclass; - static device_method_t gpiokeys_methods[] = { DEVMETHOD(device_probe, gpiokeys_probe), DEVMETHOD(device_attach, gpiokeys_attach), @@ -1054,5 +1052,5 @@ static driver_t gpiokeys_driver = { sizeof(struct gpiokeys_softc), }; -DRIVER_MODULE(gpiokeys, simplebus, gpiokeys_driver, gpiokeys_devclass, gpiokeys_driver_load, 0); +DRIVER_MODULE(gpiokeys, simplebus, gpiokeys_driver, gpiokeys_driver_load, NULL); MODULE_VERSION(gpiokeys, 1); diff --git a/sys/dev/gpio/gpioled.c b/sys/dev/gpio/gpioled.c index a3d686478469..1fecb0c20a80 100644 --- a/sys/dev/gpio/gpioled.c +++ b/sys/dev/gpio/gpioled.c @@ -138,8 +138,6 @@ gpioled_detach(device_t dev) return (0); } -static devclass_t gpioled_devclass; - static device_method_t gpioled_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpioled_probe), @@ -155,6 +153,6 @@ static driver_t gpioled_driver = { sizeof(struct gpioled_softc), }; -DRIVER_MODULE(gpioled, gpiobus, gpioled_driver, gpioled_devclass, 0, 0); +DRIVER_MODULE(gpioled, gpiobus, gpioled_driver, 0, 0); MODULE_DEPEND(gpioled, gpiobus, 1, 1, 1); MODULE_VERSION(gpioled, 1); diff --git a/sys/dev/gpio/gpioled_fdt.c b/sys/dev/gpio/gpioled_fdt.c index 58bcd0fbd2bb..b5eeb88feb40 100644 --- a/sys/dev/gpio/gpioled_fdt.c +++ b/sys/dev/gpio/gpioled_fdt.c @@ -210,8 +210,6 @@ gpioled_detach(device_t dev) return (0); } -static devclass_t gpioled_devclass; - static device_method_t gpioled_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpioled_probe), @@ -227,6 +225,6 @@ static driver_t gpioled_driver = { sizeof(struct gpioleds_softc), }; -DRIVER_MODULE(gpioled, ofwbus, gpioled_driver, gpioled_devclass, 0, 0); -DRIVER_MODULE(gpioled, simplebus, gpioled_driver, gpioled_devclass, 0, 0); +DRIVER_MODULE(gpioled, ofwbus, gpioled_driver, 0, 0); +DRIVER_MODULE(gpioled, simplebus, gpioled_driver, 0, 0); MODULE_DEPEND(gpioled, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/gpiomdio.c b/sys/dev/gpio/gpiomdio.c index 8c5bc50e2f14..b062f1fcbd51 100644 --- a/sys/dev/gpio/gpiomdio.c +++ b/sys/dev/gpio/gpiomdio.c @@ -211,8 +211,6 @@ gpiomdio_get_node(device_t bus, device_t dev) return (ofw_bus_get_node(bus)); } -static devclass_t gpiomdio_devclass; - static device_method_t gpiomdio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpiomdio_probe), @@ -235,8 +233,8 @@ static driver_t gpiomdio_driver = { sizeof(struct gpiomdio_softc), }; -EARLY_DRIVER_MODULE(gpiomdio, gpiobus, gpiomdio_driver, gpiomdio_devclass, - 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gpiomdio, gpiobus, gpiomdio_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); DRIVER_MODULE(miibus, gpiomdio, miibus_driver, 0, 0); MODULE_DEPEND(gpiomdio, gpiobus, 1, 1, 1); MODULE_DEPEND(gpiomdio, miibus, 1, 1, 1); diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c index 3a87ba6597ce..28ca9ad36fb6 100644 --- a/sys/dev/gpio/gpiopower.c +++ b/sys/dev/gpio/gpiopower.c @@ -116,8 +116,6 @@ gpiopower_assert(device_t dev, int howto) DELAY(10000000); } -static devclass_t gpiopower_devclass; - static device_method_t gpiopower_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpiopower_probe), @@ -132,5 +130,5 @@ static driver_t gpiopower_driver = { sizeof(struct gpiopower_softc) }; -DRIVER_MODULE(gpiopower, simplebus, gpiopower_driver, gpiopower_devclass, 0, 0); +DRIVER_MODULE(gpiopower, simplebus, gpiopower_driver, 0, 0); MODULE_DEPEND(gpiopower, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/gpiopps.c b/sys/dev/gpio/gpiopps.c index 741bfa4498a6..6fef00677f05 100644 --- a/sys/dev/gpio/gpiopps.c +++ b/sys/dev/gpio/gpiopps.c @@ -50,8 +50,6 @@ static struct ofw_compat_data compat_data[] = { SIMPLEBUS_PNP_INFO(compat_data); #endif /* FDT */ -static devclass_t pps_devclass; - struct pps_softc { device_t dev; gpio_pin_t gpin; @@ -285,6 +283,6 @@ static driver_t pps_fdt_driver = { sizeof(struct pps_softc), }; -DRIVER_MODULE(gpiopps, simplebus, pps_fdt_driver, pps_devclass, 0, 0); +DRIVER_MODULE(gpiopps, simplebus, pps_fdt_driver, 0, 0); #endif /* FDT */ diff --git a/sys/dev/gpio/gpioregulator.c b/sys/dev/gpio/gpioregulator.c index 77e364e5820e..cf5228513aa2 100644 --- a/sys/dev/gpio/gpioregulator.c +++ b/sys/dev/gpio/gpioregulator.c @@ -340,8 +340,6 @@ static driver_t gpioregulator_driver = { sizeof(struct gpioregulator_softc), }; -static devclass_t gpioregulator_devclass; - -EARLY_DRIVER_MODULE(gpioregulator, simplebus, gpioregulator_driver, - gpioregulator_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); +EARLY_DRIVER_MODULE(gpioregulator, simplebus, gpioregulator_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); MODULE_VERSION(gpioregulator, 1); diff --git a/sys/dev/gpio/gpiospi.c b/sys/dev/gpio/gpiospi.c index 92bf073ff66d..04e15728ca57 100644 --- a/sys/dev/gpio/gpiospi.c +++ b/sys/dev/gpio/gpiospi.c @@ -396,9 +396,7 @@ static driver_t gpio_spi_driver = { sizeof(struct gpio_spi_softc), }; -static devclass_t gpio_spi_devclass; - -DRIVER_MODULE(gpiospi, gpiobus, gpio_spi_driver, gpio_spi_devclass, 0, 0); +DRIVER_MODULE(gpiospi, gpiobus, gpio_spi_driver, 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/gpio/gpioths.c b/sys/dev/gpio/gpioths.c index c08d772ddb9b..908e3f6fc38e 100644 --- a/sys/dev/gpio/gpioths.c +++ b/sys/dev/gpio/gpioths.c @@ -405,13 +405,11 @@ static device_method_t gpioths_methods[] = { DEVMETHOD_END }; -static devclass_t gpioths_devclass; - DEFINE_CLASS_0(gpioths, gpioths_driver, gpioths_methods, sizeof(struct gpioths_softc)); #ifdef FDT -DRIVER_MODULE(gpioths, simplebus, gpioths_driver, gpioths_devclass, 0, 0); +DRIVER_MODULE(gpioths, simplebus, gpioths_driver, 0, 0); #endif -DRIVER_MODULE(gpioths, gpiobus, gpioths_driver, gpioths_devclass, 0, 0); +DRIVER_MODULE(gpioths, gpiobus, gpioths_driver, 0, 0); MODULE_DEPEND(gpioths, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/pl061_acpi.c b/sys/dev/gpio/pl061_acpi.c index edfd8926a936..ab7c5adab68c 100644 --- a/sys/dev/gpio/pl061_acpi.c +++ b/sys/dev/gpio/pl061_acpi.c @@ -96,9 +96,7 @@ static device_method_t pl061_acpi_methods[] = { DEFINE_CLASS_1(gpio, pl061_acpi_driver, pl061_acpi_methods, sizeof(struct pl061_softc), pl061_driver); -static devclass_t pl061_devclass; - -EARLY_DRIVER_MODULE(pl061, acpi, pl061_acpi_driver, pl061_devclass, NULL, NULL, +EARLY_DRIVER_MODULE(pl061, acpi, pl061_acpi_driver, NULL, NULL, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(pl061, acpi, 1, 1, 1); MODULE_DEPEND(pl061, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/pl061_fdt.c b/sys/dev/gpio/pl061_fdt.c index 26b30dc675ad..af191b78420a 100644 --- a/sys/dev/gpio/pl061_fdt.c +++ b/sys/dev/gpio/pl061_fdt.c @@ -90,8 +90,6 @@ static device_method_t pl061_fdt_methods[] = { DEFINE_CLASS_1(gpio, pl061_fdt_driver, pl061_fdt_methods, sizeof(struct pl061_softc), pl061_driver); -static devclass_t pl061_devclass; - -EARLY_DRIVER_MODULE(pl061, ofwbus, pl061_fdt_driver, pl061_devclass, NULL, NULL, +EARLY_DRIVER_MODULE(pl061, ofwbus, pl061_fdt_driver, NULL, NULL, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(pl061, gpiobus, 1, 1, 1); diff --git a/sys/dev/gpio/qoriq_gpio.c b/sys/dev/gpio/qoriq_gpio.c index 7cef100f74f9..dde10ad310a4 100644 --- a/sys/dev/gpio/qoriq_gpio.c +++ b/sys/dev/gpio/qoriq_gpio.c @@ -434,11 +434,8 @@ static device_method_t qoriq_gpio_methods[] = { DEVMETHOD_END }; -static devclass_t qoriq_gpio_devclass; - DEFINE_CLASS_0(gpio, qoriq_gpio_driver, qoriq_gpio_methods, sizeof(struct qoriq_gpio_softc)); -EARLY_DRIVER_MODULE(qoriq_gpio, simplebus, qoriq_gpio_driver, - qoriq_gpio_devclass, NULL, NULL, +EARLY_DRIVER_MODULE(qoriq_gpio, simplebus, qoriq_gpio_driver, NULL, NULL, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/dev/nctgpio/nctgpio.c b/sys/dev/nctgpio/nctgpio.c index 8e7dd085ffcd..56f37da45bc3 100644 --- a/sys/dev/nctgpio/nctgpio.c +++ b/sys/dev/nctgpio/nctgpio.c @@ -781,9 +781,7 @@ static driver_t nct_driver = { sizeof(struct nct_softc) }; -static devclass_t nct_devclass; - -DRIVER_MODULE(nctgpio, superio, nct_driver, nct_devclass, NULL, NULL); +DRIVER_MODULE(nctgpio, superio, nct_driver, NULL, NULL); MODULE_DEPEND(nctgpio, gpiobus, 1, 1, 1); MODULE_DEPEND(nctgpio, superio, 1, 1, 1); MODULE_VERSION(nctgpio, 1); diff --git a/sys/dev/rccgpio/rccgpio.c b/sys/dev/rccgpio/rccgpio.c index 3e456f0a3e8d..33615e53143a 100644 --- a/sys/dev/rccgpio/rccgpio.c +++ b/sys/dev/rccgpio/rccgpio.c @@ -362,13 +362,11 @@ static device_method_t rcc_gpio_methods[] = { DEVMETHOD_END }; -static devclass_t rcc_gpio_devclass; - static driver_t rcc_gpio_driver = { "gpio", rcc_gpio_methods, sizeof(struct rcc_gpio_softc), }; -DRIVER_MODULE(rcc_gpio, isa, rcc_gpio_driver, rcc_gpio_devclass, 0, 0); +DRIVER_MODULE(rcc_gpio, isa, rcc_gpio_driver, 0, 0); MODULE_DEPEND(rcc_gpio, gpiobus, 1, 1, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205091922.249JMea0085166>