git: 3e9318692d2f - main - arm/arm: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 May 2022 21:47:43 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e9318692d2f4850e7f51f35c0a6a79eb026f240
commit 3e9318692d2f4850e7f51f35c0a6a79eb026f240
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-09 21:26:44 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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)