From patchwork Wed Mar 16 18:37:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12783036 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D608DC433FE for ; Wed, 16 Mar 2022 18:39:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fRlHxyQHAtMob4rCM74aTfpiNF9v0hA7px3E4Td/mII=; b=BGSYI+kGQtqar0 TVZx4I1nJfoPkes4ex6LRfNh9xx8pUicVQ+u2b6n8jRr4ahMPDuON4BL9XT7pMgUn28WTpr3j1xF7 JN6+GjQNae+eKtn+NuufQ3CXTXh534f0hlaPxO+RVYjrOUfDmxDgI1W5l0SSJluTkHgbG+cQonnNp olDCRFLHj72FVdEuEHlIbYxulNgcgmNU7Tehq2rHO1oXxwrVdpBxpY/JKUKMPduVnMa63QmxlVZeG sm1pe6BckyVH4XehYvfS3dU+AW/P5K7HRMrG401uSvZyWfpChPQCxCeE80pC8HalkdpDnUxBVZKNF fR9AJQpvhoauNvbTYZZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUYXH-00E5tW-7P; Wed, 16 Mar 2022 18:38:15 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUYXE-00E5sh-7M for linux-arm-kernel@lists.infradead.org; Wed, 16 Mar 2022 18:38:13 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1373BB81CA9; Wed, 16 Mar 2022 18:38:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DABDC340E9; Wed, 16 Mar 2022 18:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647455888; bh=B44gI3eqtidBdl9JbCiN+XY0RrXD4K8IvxUOi+CN0lA=; h=From:To:Cc:Subject:Date:From; b=U4+gfYSo5pOAJFR3Q5557xe3zQWxbZZMpGPHu9zPQrmq2GDKsofsw/2qFINdr43jC NfI59lmeNhax1dqpTn4TohBpt+XM9XbfNN9yAScjAT1K8ijxisG7p++6PCL+JC97Oy HjcF6TLq1trAmpP9/octZ2EVJ2jvBq6OvK4xcQsq7gnu+9U3sYTMCAdMxizyfSkedD pa8XybsJNKKqAxnxr5I1R+5fLOmZ7oZRmE6LJYANLl2tkCZsDgWiC5C8SlZnslm/l5 eyLqp6Sar41lEBwr4oizuGcFfcYotxFHkLDcta4M5VhRidUBGL+Ub2FH99FoPUnoec DAqewCIY/uPbA== From: Arnd Bergmann To: Catalin Marinas , Will Deacon Cc: Arnd Bergmann , Suzuki K Poulose , Anshuman Khandual , Mathieu Poirier , James Morse , Rich Wiley , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: errata: avoid duplicate field initializer Date: Wed, 16 Mar 2022 19:37:45 +0100 Message-Id: <20220316183800.1546731-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220316_113812_465630_00F40D0A X-CRM114-Status: GOOD ( 12.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The '.type' field is initialized both in place and in the macro as reported by this W=1 warning: arch/arm64/include/asm/cpufeature.h:281:9: error: initialized field overwritten [-Werror=override-init] 281 | (ARM64_CPUCAP_SCOPE_LOCAL_CPU | ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU) | ^ arch/arm64/kernel/cpu_errata.c:136:17: note: in expansion of macro 'ARM64_CPUCAP_LOCAL_CPU_ERRATUM' 136 | .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/kernel/cpu_errata.c:145:9: note: in expansion of macro 'ERRATA_MIDR_RANGE' 145 | ERRATA_MIDR_RANGE(m, var, r_min, var, r_max) | ^~~~~~~~~~~~~~~~~ arch/arm64/kernel/cpu_errata.c:613:17: note: in expansion of macro 'ERRATA_MIDR_REV_RANGE' 613 | ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2), | ^~~~~~~~~~~~~~~~~~~~~ arch/arm64/include/asm/cpufeature.h:281:9: note: (near initialization for 'arm64_errata[18].type') 281 | (ARM64_CPUCAP_SCOPE_LOCAL_CPU | ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU) | ^ Remove the extranous initializer. Signed-off-by: Arnd Bergmann --- arch/arm64/kernel/cpu_errata.c | 1 - 1 file changed, 1 deletion(-) I see this warning on 5.17-rc8, but did not test it on linux-next, which may already have a fix. diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index a337760f4423..ee7fbd13d030 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -609,7 +609,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "ARM erratum 2077057", .capability = ARM64_WORKAROUND_2077057, - .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2), }, #endif