From nobody Mon May 9 21:47:43 2022 X-Original-To: dev-commits-src-all@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 D6DC71AC9B0B; Mon, 9 May 2022 21:47:43 +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 4Kxvsq4DZkz3Gd2; Mon, 9 May 2022 21:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652132863; 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=L3ky4512yBS+5ZoFJQm0QFYQR0VvPKKwO707sesSdXY=; b=kzqztUW4iVPUuR6JqVOJOQaefC873y1c0jN9S8xY0C50a9p00esNbqCRcmsPKwt48R4LmB hMYRkSRHj5x+GEZ7y0d1y9n881UEW2cT/2tCytoBp1nEZJIn2wY9O6Db+6WYwjgER5bbqz RM2EQB2kFNamr2uKQaMh12sdJKdBDij6xiUKFpVdYRlnObhHhm77b5UFZ7M9N4ui1Ql2Sl aAMDSr1GZL/qTIHY2jfeGROBCSsHM12+NePXS8j5s9yb3/aZj2ofUzU1v8zIMUeKGd9u6D NQ+A5KWtd1YYSAAlU4QawmwbtzmsIU6oi+kt/tCZoLH7SQZoG3ljyjca+XJywQ== 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 580F718EA1; Mon, 9 May 2022 21:47:43 +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 249LlhpG080029; Mon, 9 May 2022 21:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249Llhnu080028; Mon, 9 May 2022 21:47:43 GMT (envelope-from git) Date: Mon, 9 May 2022 21:47:43 GMT Message-Id: <202205092147.249Llhnu080028@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: 3e9318692d2f - main - arm/arm: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3e9318692d2f4850e7f51f35c0a6a79eb026f240 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652132863; 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=L3ky4512yBS+5ZoFJQm0QFYQR0VvPKKwO707sesSdXY=; b=NQtFOzsxUEtfEQpV/kMbn+9ezS21+XtK7y6jfU/rjL+ivXL5wQN+VLFZeBaFteFpWhq4/X fmWt4QZEskHtRKqA2ipdk+fjvPJpMaVCLGIk6GUhcrzw57vh9NCbwNhFBEuyEVuHUyUFs3 H8+mS9L3pfgYykXbWsvWdJlvyM27ptUTH5jup11WRNxv8YAma6GX8sl7E5D6pL79jzQXTR zeUgwhiTiJFrrEEw1os/xCjq6uFm6MimTOXt4xg9Qf57KbJ05nDCgXEcDCCFZYk7uZz34R Ca6DaTNqKtrgsJp06ERwlKOPikQOvyknGl8LVG9tEt1IX9Q4/ZQZ3ibnSb+yOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652132863; a=rsa-sha256; cv=none; b=Rw282mZUkO8g0HS/z8yNRFFFCrswk/8Y10iKPplCVlELUX/2GRsmi/CUKzinhjK//vtJ/H YI9+e30aLnCI5EUrhxqRV65sBLhVcG83RgOH6YsHmB8iGZuARH5BTmjLx5dAikjYYP1H/p Z54ZbDotQOfnG33mwU/SF4Rq7jvXj7UUtgiFa3uex3mi/kVSptouORs69AT6fVJGgk8dQe OCE+cYBI91p1ALVMYi5ZnWrcz0cQ3+0EPbTpoAivOopxRPs/Dqu8B6u0XkXJO59QOKrkNw x8Z0YNblqqOSJ3Wt7Vjmci0CkyYe9+3CKj+6zRmHojgcMQ8hqC110uGUByVQyg== 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=3e9318692d2f4850e7f51f35c0a6a79eb026f240 commit 3e9318692d2f4850e7f51f35c0a6a79eb026f240 Author: John Baldwin AuthorDate: 2022-05-09 21:26:44 +0000 Commit: John Baldwin CommitDate: 2022-05-09 21:26:44 +0000 arm/arm: Remove unused devclass arguments to DRIVER_MODULE. --- sys/arm/arm/generic_timer.c | 16 ++++++---------- sys/arm/arm/gic_acpi.c | 10 +++------- sys/arm/arm/gic_fdt.c | 12 ++++-------- sys/arm/arm/mpcore_timer.c | 6 ++---- sys/arm/arm/nexus.c | 4 ++-- sys/arm/arm/pl310.c | 3 +-- sys/arm/arm/pmu_acpi.c | 4 +--- sys/arm/arm/pmu_fdt.c | 4 +--- sys/arm/arm/sp804.c | 4 +--- 9 files changed, 21 insertions(+), 42 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index e3c54c237967..0e0e8a53bcce 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -504,12 +504,10 @@ static driver_t arm_tmr_fdt_driver = { sizeof(struct arm_tmr_softc), }; -static devclass_t arm_tmr_fdt_devclass; - -EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_fdt_driver, arm_tmr_fdt_devclass, - 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); -EARLY_DRIVER_MODULE(timer, ofwbus, arm_tmr_fdt_driver, arm_tmr_fdt_devclass, - 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_fdt_driver, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(timer, ofwbus, arm_tmr_fdt_driver, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); #endif #ifdef DEV_ACPI @@ -526,10 +524,8 @@ static driver_t arm_tmr_acpi_driver = { sizeof(struct arm_tmr_softc), }; -static devclass_t arm_tmr_acpi_devclass; - -EARLY_DRIVER_MODULE(timer, acpi, arm_tmr_acpi_driver, arm_tmr_acpi_devclass, - 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(timer, acpi, arm_tmr_acpi_driver, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); #endif static void diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index 97d8db75fe41..662221b0c409 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -80,9 +80,7 @@ static device_method_t gic_acpi_methods[] = { DEFINE_CLASS_1(gic, gic_acpi_driver, gic_acpi_methods, sizeof(struct arm_gic_softc), arm_gic_driver); -static devclass_t gic_acpi_devclass; - -EARLY_DRIVER_MODULE(gic, acpi, gic_acpi_driver, gic_acpi_devclass, 0, 0, +EARLY_DRIVER_MODULE(gic, acpi, gic_acpi_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); struct madt_table_data { @@ -354,7 +352,5 @@ static device_method_t arm_gicv2m_acpi_methods[] = { DEFINE_CLASS_1(gicv2m, arm_gicv2m_acpi_driver, arm_gicv2m_acpi_methods, sizeof(struct arm_gicv2m_softc), arm_gicv2m_driver); -static devclass_t arm_gicv2m_acpi_devclass; - -EARLY_DRIVER_MODULE(gicv2m_acpi, gic, arm_gicv2m_acpi_driver, - arm_gicv2m_acpi_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gicv2m_acpi, gic, arm_gicv2m_acpi_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm/arm/gic_fdt.c b/sys/arm/arm/gic_fdt.c index bf43339d65bd..5b1b77024df6 100644 --- a/sys/arm/arm/gic_fdt.c +++ b/sys/arm/arm/gic_fdt.c @@ -105,11 +105,9 @@ static device_method_t gic_fdt_methods[] = { DEFINE_CLASS_1(gic, gic_fdt_driver, gic_fdt_methods, sizeof(struct arm_gic_fdt_softc), arm_gic_driver); -static devclass_t gic_fdt_devclass; - -EARLY_DRIVER_MODULE(gic, simplebus, gic_fdt_driver, gic_fdt_devclass, 0, 0, +EARLY_DRIVER_MODULE(gic, simplebus, gic_fdt_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); -EARLY_DRIVER_MODULE(gic, ofwbus, gic_fdt_driver, gic_fdt_devclass, 0, 0, +EARLY_DRIVER_MODULE(gic, ofwbus, gic_fdt_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); static int @@ -357,7 +355,5 @@ static device_method_t arm_gicv2m_fdt_methods[] = { DEFINE_CLASS_1(gicv2m, arm_gicv2m_fdt_driver, arm_gicv2m_fdt_methods, sizeof(struct arm_gicv2m_softc), arm_gicv2m_driver); -static devclass_t arm_gicv2m_fdt_devclass; - -EARLY_DRIVER_MODULE(gicv2m, gic, arm_gicv2m_fdt_driver, - arm_gicv2m_fdt_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gicv2m, gic, arm_gicv2m_fdt_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c index de8dce5dac83..c182bae0a563 100644 --- a/sys/arm/arm/mpcore_timer.c +++ b/sys/arm/arm/mpcore_timer.c @@ -459,11 +459,9 @@ static driver_t arm_tmr_driver = { sizeof(struct arm_tmr_softc), }; -static devclass_t arm_tmr_devclass; - -EARLY_DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0, +EARLY_DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); -EARLY_DRIVER_MODULE(mp_tmr, ofwbus, arm_tmr_driver, arm_tmr_devclass, 0, 0, +EARLY_DRIVER_MODULE(mp_tmr, ofwbus, arm_tmr_driver, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); /* diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index be84ab82d43f..958d2cc70587 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -142,13 +142,13 @@ static device_method_t nexus_methods[] = { { 0, 0 } }; -static devclass_t nexus_devclass; static driver_t nexus_driver = { "nexus", nexus_methods, 1 /* no softc */ }; -EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, + +EARLY_DRIVER_MODULE(nexus, root, nexus_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_EARLY); static int diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c index 86e5fb84c7db..a7794216c6cf 100644 --- a/sys/arm/arm/pl310.c +++ b/sys/arm/arm/pl310.c @@ -587,7 +587,6 @@ static driver_t pl310_driver = { pl310_methods, sizeof(struct pl310_softc), }; -static devclass_t pl310_devclass; -EARLY_DRIVER_MODULE(pl310, simplebus, pl310_driver, pl310_devclass, 0, 0, +EARLY_DRIVER_MODULE(pl310, simplebus, pl310_driver, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm/arm/pmu_acpi.c b/sys/arm/arm/pmu_acpi.c index b1378c24e833..2e031338f144 100644 --- a/sys/arm/arm/pmu_acpi.c +++ b/sys/arm/arm/pmu_acpi.c @@ -190,6 +190,4 @@ static device_method_t pmu_acpi_methods[] = { DEFINE_CLASS_0(pmu, pmu_acpi_driver, pmu_acpi_methods, sizeof(struct pmu_softc)); -static devclass_t pmu_acpi_devclass; - -DRIVER_MODULE(pmu, acpi, pmu_acpi_driver, pmu_acpi_devclass, 0, 0); +DRIVER_MODULE(pmu, acpi, pmu_acpi_driver, 0, 0); diff --git a/sys/arm/arm/pmu_fdt.c b/sys/arm/arm/pmu_fdt.c index 2e03fc98bfe0..0b435375aa22 100644 --- a/sys/arm/arm/pmu_fdt.c +++ b/sys/arm/arm/pmu_fdt.c @@ -234,6 +234,4 @@ static driver_t pmu_fdt_driver = { sizeof(struct pmu_softc), }; -static devclass_t pmu_fdt_devclass; - -DRIVER_MODULE(pmu, simplebus, pmu_fdt_driver, pmu_fdt_devclass, 0, 0); +DRIVER_MODULE(pmu, simplebus, pmu_fdt_driver, 0, 0); diff --git a/sys/arm/arm/sp804.c b/sys/arm/arm/sp804.c index b0f08923c803..7f23f4789f1a 100644 --- a/sys/arm/arm/sp804.c +++ b/sys/arm/arm/sp804.c @@ -310,9 +310,7 @@ static driver_t sp804_timer_driver = { sizeof(struct sp804_timer_softc), }; -static devclass_t sp804_timer_devclass; - -DRIVER_MODULE(sp804_timer, simplebus, sp804_timer_driver, sp804_timer_devclass, 0, 0); +DRIVER_MODULE(sp804_timer, simplebus, sp804_timer_driver, 0, 0); static void sp804_timer_delay(int usec, void *arg)