git: bb62bc2284c4 - main - arm64: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 May 2022 21:47:55 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bb62bc2284c4ebe059474604da001eb564279189 commit bb62bc2284c4ebe059474604da001eb564279189 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-09 21:26:45 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-09 21:26:45 +0000 arm64: Remove unused devclass arguments to DRIVER_MODULE. --- sys/arm64/arm64/gic_v3_acpi.c | 6 ++---- sys/arm64/arm64/gic_v3_fdt.c | 10 ++++------ sys/arm64/arm64/gicv3_its.c | 10 ++++------ sys/arm64/arm64/nexus.c | 10 ++++------ sys/arm64/iommu/smmu_acpi.c | 6 ++---- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 6a090baffacf..cbe4d5989ec2 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -77,10 +77,8 @@ static device_method_t gic_v3_acpi_methods[] = { DEFINE_CLASS_1(gic, gic_v3_acpi_driver, gic_v3_acpi_methods, sizeof(struct gic_v3_softc), gic_v3_driver); -static devclass_t gic_v3_acpi_devclass; - -EARLY_DRIVER_MODULE(gic_v3, acpi, gic_v3_acpi_driver, gic_v3_acpi_devclass, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gic_v3, acpi, gic_v3_acpi_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); struct madt_table_data { device_t parent; diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c index 65d7ca7e374d..41c6297649fb 100644 --- a/sys/arm64/arm64/gic_v3_fdt.c +++ b/sys/arm64/arm64/gic_v3_fdt.c @@ -84,12 +84,10 @@ static device_method_t gic_v3_fdt_methods[] = { DEFINE_CLASS_1(gic, gic_v3_fdt_driver, gic_v3_fdt_methods, sizeof(struct gic_v3_softc), gic_v3_driver); -static devclass_t gic_v3_fdt_devclass; - -EARLY_DRIVER_MODULE(gic_v3, simplebus, gic_v3_fdt_driver, gic_v3_fdt_devclass, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); -EARLY_DRIVER_MODULE(gic_v3, ofwbus, gic_v3_fdt_driver, gic_v3_fdt_devclass, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gic_v3, simplebus, gic_v3_fdt_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gic_v3, ofwbus, gic_v3_fdt_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); /* * Helper functions declarations. diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index a77be66bdd7f..40e42bc5214e 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -1937,10 +1937,9 @@ static device_method_t gicv3_its_fdt_methods[] = { DEFINE_CLASS_1(its, gicv3_its_fdt_driver, gicv3_its_fdt_methods, sizeof(struct gicv3_its_softc), gicv3_its_driver); #undef its_baseclasses -static devclass_t gicv3_its_fdt_devclass; -EARLY_DRIVER_MODULE(its_fdt, gic, gicv3_its_fdt_driver, - gicv3_its_fdt_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(its_fdt, gic, gicv3_its_fdt_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); static int gicv3_its_fdt_probe(device_t dev) @@ -2007,10 +2006,9 @@ static device_method_t gicv3_its_acpi_methods[] = { DEFINE_CLASS_1(its, gicv3_its_acpi_driver, gicv3_its_acpi_methods, sizeof(struct gicv3_its_softc), gicv3_its_driver); #undef its_baseclasses -static devclass_t gicv3_its_acpi_devclass; -EARLY_DRIVER_MODULE(its_acpi, gic, gicv3_its_acpi_driver, - gicv3_its_acpi_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(its_acpi, gic, gicv3_its_acpi_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); static int gicv3_its_acpi_probe(device_t dev) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 0775cc820a8c..defd6755c48e 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -482,10 +482,9 @@ static device_method_t nexus_fdt_methods[] = { #define nexus_baseclasses nexus_fdt_baseclasses DEFINE_CLASS_1(nexus, nexus_fdt_driver, nexus_fdt_methods, 1, nexus_driver); #undef nexus_baseclasses -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_fdt_probe(device_t dev) @@ -543,10 +542,9 @@ static device_method_t nexus_acpi_methods[] = { DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); #undef nexus_baseclasses -static devclass_t nexus_acpi_devclass; -EARLY_DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_acpi_devclass, - 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); +EARLY_DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); static int nexus_acpi_probe(device_t dev) diff --git a/sys/arm64/iommu/smmu_acpi.c b/sys/arm64/iommu/smmu_acpi.c index bd59ad398e6a..a89028cbe59d 100644 --- a/sys/arm64/iommu/smmu_acpi.c +++ b/sys/arm64/iommu/smmu_acpi.c @@ -290,7 +290,5 @@ static device_method_t smmu_acpi_methods[] = { DEFINE_CLASS_1(smmu, smmu_acpi_driver, smmu_acpi_methods, sizeof(struct smmu_softc), smmu_driver); -static devclass_t smmu_acpi_devclass; - -EARLY_DRIVER_MODULE(smmu, acpi, smmu_acpi_driver, smmu_acpi_devclass, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(smmu, acpi, smmu_acpi_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);