From nobody Tue May 10 17:36:10 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 500551ACF40F; Tue, 10 May 2022 17:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KyQF70ttZz4hKG; Tue, 10 May 2022 17:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG+plScUdqVXuinI0S0ek/suRLbaHD3teAWLO/CJssY=; b=Af6gdne6BB0fuTkQQWwocMpYgCS4e1OVUDYItQGbFGonOkM2Rhy6gdnML+7QwDfDJY09uT 2tVGvJnCj44Gyzv5OBxPjakoAFZCxdKixJR9qV+wrDHl2C/jdnTfHdNaPCjG8pYYBsYIKF UMqaqIzNonka7w9NiHRx3BWLP5kIIYxBwbEcit9EErJOlDOIMwQe5Tq83W4UYKHfkWgkvQ M3dv6hM5bdzFWu2jlYJ0DuxS2xHZ87/l6/O9gAcrQZGTSZfSe1RyeCn03HxxYnbDlIarzB MgiUO+9W8dbDi8bJF21LPhlB3c/8/BtJaPbo2vMVpvFSLacVdbLaMO7mV8FNoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9FF5E17F6; Tue, 10 May 2022 17:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24AHaANA098751; Tue, 10 May 2022 17:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AHaA9g098750; Tue, 10 May 2022 17:36:10 GMT (envelope-from git) Date: Tue, 10 May 2022 17:36:10 GMT Message-Id: <202205101736.24AHaA9g098750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2663ef1bae01 - main - riscv: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2663ef1bae010c91d6a1012d6fbe8a4d4cffc314 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG+plScUdqVXuinI0S0ek/suRLbaHD3teAWLO/CJssY=; b=PZt2f/c567tnUCegVa+r2sQFLu6sqz4Pvgq0ZWogigSPoS8ju2aa7KnxbLAQBT9TuENezz /CXo0KFxwsdxFe0ioOYJBNWCLDp6Ruzw/oKu9FytmeNZPivNsNvhONsvumWhSuSW5mqg2t AhKnmLimin7APo7EfSrdujps9Ytfaz38ySGs47KRFctvTZ/jnth9HEyktaWZy/oFG6zVQ8 xBjfBWGX6zhYjjBEoVtawVp1YRJPmOOFcVIuPtTK5N0fo7g96MZSSmw2+v9bbXJVh33bi5 6WPcDmVNGifXOIuz8HfjcdHjxgBCR1oSR4w9oCtBcwC6Fb6pOZ8i0LnYPVcsxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652204171; a=rsa-sha256; cv=none; b=HonlAfY41o1dWdQDY4Ou6jaFErc+pbo+VnrlozWV89qJ8CkHhbe95LzJDaJSOB96EW/Ik8 ViZRFsq9YdMbG9ceXfNsTyBhRuDs74FQeB1LHgaFlu+NDThpYHUFCHByhWakTBWRe9s5r0 aVqUABURKFQyRY3zulKNfyuiKtXurgSE/NvbjMoT54pmCLSdb2Cw+erG6lYNvDnyoX9Ukz heNPGNiC8lu6Q+/j9pWvyjp9QGHNrcqcFT2IsLQrhvRmNFnN9CbtUuIYhQ5jN8AgqZO72M JnGNWEMG2JiT89+aj6V6WerYsf6DV+VmcBGIjP5DBBWpRdqyrecY4aB616uvZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2663ef1bae010c91d6a1012d6fbe8a4d4cffc314 commit 2663ef1bae010c91d6a1012d6fbe8a4d4cffc314 Author: John Baldwin AuthorDate: 2022-05-10 17:21:37 +0000 Commit: John Baldwin 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)