Date: Tue, 10 May 2022 17:36:10 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: 2663ef1bae01 - main - riscv: Remove unused devclass arguments to DRIVER_MODULE. Message-ID: <202205101736.24AHaA9g098750@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=2663ef1bae010c91d6a1012d6fbe8a4d4cffc314 commit 2663ef1bae010c91d6a1012d6fbe8a4d4cffc314 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-10 17:21:37 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-10 17:21:37 +0000 riscv: Remove unused devclass arguments to DRIVER_MODULE. --- sys/riscv/riscv/mp_machdep.c | 3 +-- sys/riscv/riscv/nexus.c | 6 ++---- sys/riscv/riscv/plic.c | 6 ++---- sys/riscv/riscv/riscv_console.c | 4 +--- sys/riscv/riscv/riscv_syscon.c | 5 ++--- sys/riscv/riscv/timer.c | 6 ++---- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index 74647b8fcba4..c460eb033799 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -125,14 +125,13 @@ static device_method_t riscv64_cpu_methods[] = { DEVMETHOD_END }; -static devclass_t riscv64_cpu_devclass; static driver_t riscv64_cpu_driver = { "riscv64_cpu", riscv64_cpu_methods, 0 }; -DRIVER_MODULE(riscv64_cpu, cpu, riscv64_cpu_driver, riscv64_cpu_devclass, 0, 0); +DRIVER_MODULE(riscv64_cpu, cpu, riscv64_cpu_driver, 0, 0); static void riscv64_cpu_identify(driver_t *driver, device_t parent) diff --git a/sys/riscv/riscv/nexus.c b/sys/riscv/riscv/nexus.c index 16fe971b6521..3818f9e91996 100644 --- a/sys/riscv/riscv/nexus.c +++ b/sys/riscv/riscv/nexus.c @@ -446,10 +446,8 @@ nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, return (0); } -static devclass_t nexus_fdt_devclass; - -EARLY_DRIVER_MODULE(nexus_fdt, root, nexus_fdt_driver, nexus_fdt_devclass, - 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); +EARLY_DRIVER_MODULE(nexus_fdt, root, nexus_fdt_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); static int nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c index aeb2b4835d16..cea3bab81c20 100644 --- a/sys/riscv/riscv/plic.c +++ b/sys/riscv/riscv/plic.c @@ -467,7 +467,5 @@ static driver_t plic_driver = { sizeof(struct plic_softc), }; -static devclass_t plic_devclass; - -EARLY_DRIVER_MODULE(plic, simplebus, plic_driver, plic_devclass, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(plic, simplebus, plic_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/riscv/riscv/riscv_console.c b/sys/riscv/riscv/riscv_console.c index abedf8fa8c55..c09d5b3b96a8 100644 --- a/sys/riscv/riscv/riscv_console.c +++ b/sys/riscv/riscv/riscv_console.c @@ -266,6 +266,4 @@ static driver_t rcons_driver = { sizeof(struct rcons_softc) }; -static devclass_t rcons_devclass; - -DRIVER_MODULE(rcons, nexus, rcons_driver, rcons_devclass, 0, 0); +DRIVER_MODULE(rcons, nexus, rcons_driver, 0, 0); diff --git a/sys/riscv/riscv/riscv_syscon.c b/sys/riscv/riscv/riscv_syscon.c index 8613b298b797..32d02cd3285b 100644 --- a/sys/riscv/riscv/riscv_syscon.c +++ b/sys/riscv/riscv/riscv_syscon.c @@ -77,8 +77,7 @@ static device_method_t riscv_syscon_methods[] = { DEFINE_CLASS_1(riscv_syscon, riscv_syscon_driver, riscv_syscon_methods, sizeof(struct syscon_generic_softc), syscon_generic_driver); -static devclass_t riscv_syscon_devclass; /* riscv_syscon needs to attach prior to syscon_power */ -EARLY_DRIVER_MODULE(riscv_syscon, simplebus, riscv_syscon_driver, - riscv_syscon_devclass, 0, 0, BUS_PASS_SCHEDULER + BUS_PASS_ORDER_LAST); +EARLY_DRIVER_MODULE(riscv_syscon, simplebus, riscv_syscon_driver, 0, 0, + BUS_PASS_SCHEDULER + BUS_PASS_ORDER_LAST); MODULE_VERSION(riscv_syscon, 1); diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index c75350f4aac5..850dc83594ca 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -256,10 +256,8 @@ static driver_t riscv_timer_driver = { sizeof(struct riscv_timer_softc), }; -static devclass_t riscv_timer_devclass; - -EARLY_DRIVER_MODULE(timer, nexus, riscv_timer_driver, riscv_timer_devclass, - 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(timer, nexus, riscv_timer_driver, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); void DELAY(int usec)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205101736.24AHaA9g098750>