Date: Mon, 9 May 2022 21:48:08 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: b08b5f558b6a - main - altera drivers: Remove unused devclass arguments to DRIVER_MODULE. Message-ID: <202205092148.249Lm8UE080601@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=b08b5f558b6a6dd06dc5dbe2a288cc56c65bb69d commit b08b5f558b6a6dd06dc5dbe2a288cc56c65bb69d Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-09 21:26:46 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-09 21:26:46 +0000 altera drivers: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/altera/atse/if_atse.c | 2 -- sys/dev/altera/atse/if_atse_fdt.c | 2 +- sys/dev/altera/atse/if_atse_nexus.c | 2 +- sys/dev/altera/atse/if_atsereg.h | 2 -- sys/dev/altera/avgen/altera_avgen.c | 2 -- sys/dev/altera/avgen/altera_avgen.h | 2 -- sys/dev/altera/avgen/altera_avgen_fdt.c | 3 +-- sys/dev/altera/avgen/altera_avgen_nexus.c | 3 +-- sys/dev/altera/dwc/if_dwc_socfpga.c | 6 ++---- sys/dev/altera/jtag_uart/altera_jtag_uart.h | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c | 3 +-- sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c | 3 +-- sys/dev/altera/msgdma/msgdma.c | 4 +--- sys/dev/altera/pio/pio.c | 4 +--- sys/dev/altera/sdcard/altera_sdcard.c | 1 - sys/dev/altera/sdcard/altera_sdcard.h | 2 -- sys/dev/altera/sdcard/altera_sdcard_fdt.c | 3 +-- sys/dev/altera/sdcard/altera_sdcard_nexus.c | 3 +-- sys/dev/altera/softdma/softdma.c | 4 +--- 20 files changed, 13 insertions(+), 42 deletions(-) diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c index b87bad6495c4..3a81ca00d150 100644 --- a/sys/dev/altera/atse/if_atse.c +++ b/sys/dev/altera/atse/if_atse.c @@ -195,8 +195,6 @@ pxx_read_2(struct atse_softc *sc, bus_addr_t bmcr, uint32_t reg, const char *f, static void atse_tick(void *); static int atse_detach(device_t); -devclass_t atse_devclass; - static int atse_rx_enqueue(struct atse_softc *sc, uint32_t n) { diff --git a/sys/dev/altera/atse/if_atse_fdt.c b/sys/dev/altera/atse/if_atse_fdt.c index 55631eb1b99c..977f9fb1981a 100644 --- a/sys/dev/altera/atse/if_atse_fdt.c +++ b/sys/dev/altera/atse/if_atse_fdt.c @@ -143,5 +143,5 @@ static driver_t atse_driver_fdt = { sizeof(struct atse_softc) }; -DRIVER_MODULE(atse, simplebus, atse_driver_fdt, atse_devclass, 0, 0); +DRIVER_MODULE(atse, simplebus, atse_driver_fdt, 0, 0); DRIVER_MODULE(miibus, atse, miibus_driver, 0, 0); diff --git a/sys/dev/altera/atse/if_atse_nexus.c b/sys/dev/altera/atse/if_atse_nexus.c index 0d1b0d3d1200..d2ed72871471 100644 --- a/sys/dev/altera/atse/if_atse_nexus.c +++ b/sys/dev/altera/atse/if_atse_nexus.c @@ -156,5 +156,5 @@ static driver_t atse_driver_nexus = { sizeof(struct atse_softc) }; -DRIVER_MODULE(atse, nexus, atse_driver_nexus, atse_devclass, 0, 0); +DRIVER_MODULE(atse, nexus, atse_driver_nexus, 0, 0); DRIVER_MODULE(miibus, atse, miibus_driver, 0, 0); diff --git a/sys/dev/altera/atse/if_atsereg.h b/sys/dev/altera/atse/if_atsereg.h index 5841d14f759e..154fb6a0562c 100644 --- a/sys/dev/altera/atse/if_atsereg.h +++ b/sys/dev/altera/atse/if_atsereg.h @@ -463,6 +463,4 @@ int atse_miibus_readreg(device_t, int, int); int atse_miibus_writereg(device_t, int, int, int); void atse_miibus_statchg(device_t); -extern devclass_t atse_devclass; - #endif /* _DEV_IF_ATSEREG_H */ diff --git a/sys/dev/altera/avgen/altera_avgen.c b/sys/dev/altera/avgen/altera_avgen.c index d7dd7d29b1e0..49939275ff95 100644 --- a/sys/dev/altera/avgen/altera_avgen.c +++ b/sys/dev/altera/avgen/altera_avgen.c @@ -64,8 +64,6 @@ __FBSDID("$FreeBSD$"); * system-on-chip bus environments would work fine with the same code. */ -devclass_t altera_avgen_devclass; - static d_mmap_t altera_avgen_mmap; static d_read_t altera_avgen_read; static d_write_t altera_avgen_write; diff --git a/sys/dev/altera/avgen/altera_avgen.h b/sys/dev/altera/avgen/altera_avgen.h index 12496911f7c1..b42adc1093ba 100644 --- a/sys/dev/altera/avgen/altera_avgen.h +++ b/sys/dev/altera/avgen/altera_avgen.h @@ -95,6 +95,4 @@ int altera_avgen_attach(struct altera_avgen_softc *sc, const char *str_mmapio, const char *str_devname, int devunit); void altera_avgen_detach(struct altera_avgen_softc *sc); -extern devclass_t altera_avgen_devclass; - #endif /* _DEV_ALTERA_AVALON_H_ */ diff --git a/sys/dev/altera/avgen/altera_avgen_fdt.c b/sys/dev/altera/avgen/altera_avgen_fdt.c index 50cf26bc56be..a60c5daabab8 100644 --- a/sys/dev/altera/avgen/altera_avgen_fdt.c +++ b/sys/dev/altera/avgen/altera_avgen_fdt.c @@ -159,5 +159,4 @@ static driver_t altera_avgen_fdt_driver = { sizeof(struct altera_avgen_softc), }; -DRIVER_MODULE(avgen, simplebus, altera_avgen_fdt_driver, - altera_avgen_devclass, 0, 0); +DRIVER_MODULE(avgen, simplebus, altera_avgen_fdt_driver, 0, 0); diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c index edce8488cfeb..03349ed38236 100644 --- a/sys/dev/altera/avgen/altera_avgen_nexus.c +++ b/sys/dev/altera/avgen/altera_avgen_nexus.c @@ -141,5 +141,4 @@ static driver_t altera_avgen_nexus_driver = { sizeof(struct altera_avgen_softc), }; -DRIVER_MODULE(avgen, nexus, altera_avgen_nexus_driver, altera_avgen_devclass, - 0, 0); +DRIVER_MODULE(avgen, nexus, altera_avgen_nexus_driver, 0, 0); diff --git a/sys/dev/altera/dwc/if_dwc_socfpga.c b/sys/dev/altera/dwc/if_dwc_socfpga.c index c02015243de1..e899605c2541 100644 --- a/sys/dev/altera/dwc/if_dwc_socfpga.c +++ b/sys/dev/altera/dwc/if_dwc_socfpga.c @@ -101,13 +101,11 @@ static device_method_t dwc_socfpga_methods[] = { DEVMETHOD_END }; -static devclass_t dwc_socfpga_devclass; - extern driver_t dwc_driver; DEFINE_CLASS_1(dwc, dwc_socfpga_driver, dwc_socfpga_methods, sizeof(struct dwc_softc), dwc_driver); -EARLY_DRIVER_MODULE(dwc_socfpga, simplebus, dwc_socfpga_driver, - dwc_socfpga_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(dwc_socfpga, simplebus, dwc_socfpga_driver, 0, 0, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(dwc_socfpga, dwc, 1, 1, 1); diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart.h b/sys/dev/altera/jtag_uart/altera_jtag_uart.h index 9fc2877930b7..cb4015a43710 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart.h +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart.h @@ -196,6 +196,4 @@ extern u_int aju_cons_jtag_missed; int altera_jtag_uart_attach(struct altera_jtag_uart_softc *sc); void altera_jtag_uart_detach(struct altera_jtag_uart_softc *sc); -extern devclass_t altera_jtag_uart_devclass; - #endif /* _DEV_ALTERA_JTAG_UART_H_ */ diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c index 51e0b2b28699..af1f7413549c 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c @@ -50,8 +50,6 @@ __FBSDID("$FreeBSD$"); #include <dev/altera/jtag_uart/altera_jtag_uart.h> -devclass_t altera_jtag_uart_devclass; - static SYSCTL_NODE(_hw, OID_AUTO, altera_jtag_uart, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Altera JTAG UART configuration knobs"); diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c index b9ea707131da..df5c2c76fc16 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c @@ -148,5 +148,4 @@ static driver_t altera_jtag_uart_fdt_driver = { sizeof(struct altera_jtag_uart_softc), }; -DRIVER_MODULE(altera_jtag_uart, simplebus, altera_jtag_uart_fdt_driver, - altera_jtag_uart_devclass, 0, 0); +DRIVER_MODULE(altera_jtag_uart, simplebus, altera_jtag_uart_fdt_driver, 0, 0); diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c index 3f7b555eb03d..a9c8407768f4 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c @@ -139,5 +139,4 @@ static driver_t altera_jtag_uart_nexus_driver = { sizeof(struct altera_jtag_uart_softc), }; -DRIVER_MODULE(altera_jtag_uart, nexus, altera_jtag_uart_nexus_driver, - altera_jtag_uart_devclass, 0, 0); +DRIVER_MODULE(altera_jtag_uart, nexus, altera_jtag_uart_nexus_driver, 0, 0); diff --git a/sys/dev/altera/msgdma/msgdma.c b/sys/dev/altera/msgdma/msgdma.c index 0200e392f5b2..99160b7d10e4 100644 --- a/sys/dev/altera/msgdma/msgdma.c +++ b/sys/dev/altera/msgdma/msgdma.c @@ -640,7 +640,5 @@ static driver_t msgdma_driver = { sizeof(struct msgdma_softc), }; -static devclass_t msgdma_devclass; - -EARLY_DRIVER_MODULE(msgdma, simplebus, msgdma_driver, msgdma_devclass, 0, 0, +EARLY_DRIVER_MODULE(msgdma, simplebus, msgdma_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); diff --git a/sys/dev/altera/pio/pio.c b/sys/dev/altera/pio/pio.c index cd95e81c821f..74cbfb559d6b 100644 --- a/sys/dev/altera/pio/pio.c +++ b/sys/dev/altera/pio/pio.c @@ -208,6 +208,4 @@ static driver_t pio_driver = { sizeof(struct pio_softc), }; -static devclass_t pio_devclass; - -DRIVER_MODULE(altera_pio, simplebus, pio_driver, pio_devclass, 0, 0); +DRIVER_MODULE(altera_pio, simplebus, pio_driver, 0, 0); diff --git a/sys/dev/altera/sdcard/altera_sdcard.c b/sys/dev/altera/sdcard/altera_sdcard.c index 57e10fed68bd..fb79daafc88a 100644 --- a/sys/dev/altera/sdcard/altera_sdcard.c +++ b/sys/dev/altera/sdcard/altera_sdcard.c @@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$"); * 3. Handle read-only SD Cards. * 4. Tune timeouts based on real-world SD Card speeds. */ -devclass_t altera_sdcard_devclass; void altera_sdcard_attach(struct altera_sdcard_softc *sc) diff --git a/sys/dev/altera/sdcard/altera_sdcard.h b/sys/dev/altera/sdcard/altera_sdcard.h index a486971faa37..e6a6a2bf01a5 100644 --- a/sys/dev/altera/sdcard/altera_sdcard.h +++ b/sys/dev/altera/sdcard/altera_sdcard.h @@ -246,6 +246,4 @@ void altera_sdcard_start(struct altera_sdcard_softc *sc); void altera_sdcard_disk_insert(struct altera_sdcard_softc *sc); void altera_sdcard_disk_remove(struct altera_sdcard_softc *sc); -extern devclass_t altera_sdcard_devclass; - #endif /* _DEV_ALTERA_SDCARD_H_ */ diff --git a/sys/dev/altera/sdcard/altera_sdcard_fdt.c b/sys/dev/altera/sdcard/altera_sdcard_fdt.c index 93f9cb888332..6437354ce995 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_fdt.c +++ b/sys/dev/altera/sdcard/altera_sdcard_fdt.c @@ -121,5 +121,4 @@ static driver_t altera_sdcard_fdt_driver = { sizeof(struct altera_sdcard_softc), }; -DRIVER_MODULE(altera_sdcard, simplebus, altera_sdcard_fdt_driver, - altera_sdcard_devclass, 0, 0); +DRIVER_MODULE(altera_sdcard, simplebus, altera_sdcard_fdt_driver, 0, 0); diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c index b6bbcdd949e2..f4edf8097ceb 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c +++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c @@ -112,5 +112,4 @@ static driver_t altera_sdcard_nexus_driver = { sizeof(struct altera_sdcard_softc), }; -DRIVER_MODULE(altera_sdcard, nexus, altera_sdcard_nexus_driver, - altera_sdcard_devclass, 0, 0); +DRIVER_MODULE(altera_sdcard, nexus, altera_sdcard_nexus_driver, 0, 0); diff --git a/sys/dev/altera/softdma/softdma.c b/sys/dev/altera/softdma/softdma.c index 143672ee7cc7..991552101c3f 100644 --- a/sys/dev/altera/softdma/softdma.c +++ b/sys/dev/altera/softdma/softdma.c @@ -880,7 +880,5 @@ static driver_t softdma_driver = { sizeof(struct softdma_softc), }; -static devclass_t softdma_devclass; - -EARLY_DRIVER_MODULE(softdma, simplebus, softdma_driver, softdma_devclass, 0, 0, +EARLY_DRIVER_MODULE(softdma, simplebus, softdma_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205092148.249Lm8UE080601>