arm64: errata: Don't define type field twice for arm64_errata[] entries

The ERRATA_MIDR_REV_RANGE macro assigns ARM64_CPUCAP_LOCAL_CPU_ERRATUM
to the '.type' field of the 'struct arm64_cpu_capabilities', so there's
no need to assign it explicitly as well.

Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 459129712dfa013d9d8087328fd4effee4fca850..94876ab071c7c5e80dd668955b9edb3c9e17d247 100644 (file)
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -662,7 +662,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
 #ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
                .cpu_enable = enable_smccc_arch_workaround_1,
                ERRATA_MIDR_RANGE_LIST(arm64_bp_harden_smccc_cpus),
        },
@@ -671,7 +670,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        {
                .desc = "EL2 vector hardening",
                .capability = ARM64_HARDEN_EL2_VECTORS,
-               .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
                ERRATA_MIDR_RANGE_LIST(arm64_harden_el2_vectors),
        },
 #endif