From patchwork Tue Jun 18 09:48:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11001337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 588836C5 for ; Tue, 18 Jun 2019 09:48:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45DD2288A0 for ; Tue, 18 Jun 2019 09:48:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3937828A26; Tue, 18 Jun 2019 09:48:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DBF9A288A0 for ; Tue, 18 Jun 2019 09:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=5zSGGEv3a8gOPttKL8RqIz7QmuOlylR0BwCYY7dqO3Y=; b=DAsEPoxanCzVsf 9sY02dcrxmXRTvcxNandaAEYnLqSlQERavuzNWJ+hhsZFsIdweklsHRyqOFf5kOgpFmMti88Rg6wz 1r/esiCcjsMXQaJ0I3ZdBY7PmzOIJOEw6UODo8CFpsHnLebIsS8QxLEifVarJ/8pYHmLswOMZWKOe DoMb64pvJzf5HhGk8GnmYtjzJIdDLto0aK4t6K/2bzexHC9Ex4YzPGc2k7dLfRAF5iVb6GZhcZqxN tBjE7pgn3K11ftlH+iNfzGUQkMluLyU3lDP0OLPzNQOAUXfs5mfUCo9VxcdkmPtbienpGY8jO2Jdl BsQ3mE65MKSYZgNutNHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hdAjU-000535-4G; Tue, 18 Jun 2019 09:48:52 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hdAjQ-00052C-54 for linux-arm-kernel@lists.infradead.org; Tue, 18 Jun 2019 09:48:49 +0000 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MfYHW-1iEQLo2DIO-00g0zN; Tue, 18 Jun 2019 11:48:40 +0200 From: Arnd Bergmann To: Daniel Lezcano Subject: [PATCH] clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type Date: Tue, 18 Jun 2019 11:48:27 +0200 Message-Id: <20190618094835.3709679-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:UIgZ95nkkhH5yq9mtc64kQSjIUtdTsKX0SLMkEgh0FriqqYmcMv kxeFtXo0x1iEJD8RRUXpQLFNbtfh7YVHmah3VW5mD91TUWdcM1FeSZvBaQF7j4ykrXU8U42 Cbms4G14co/9jhPjG7z8eURv5cGVlcAhzENcDkEO3iYZpq1Lw/8/sc6ZVwGjaOiMKUTpIdv nMoDcSbC3beBOQtMsL4UA== X-UI-Out-Filterresults: notjunk:1;V03:K0:NrdTgJmQsLs=:pVVaicY1CbeOugFNSXSVgG rOgWiznSoDCUAl9Hqna4Qb3JWHNH1nIjTbjr8aAwykAbW+S78E2Zr6hsxeX0/OJpgFunrxJZ5 EDGRkVaBqNFI52AjT1TjJWlDEdhYS8IlX8kjXUSpZ9l4gSTwP4ctBNftgEYjxRigP21c+WBuQ jj9hcUfMxcSz5MkuK1t7wMjghZs4SaPmRokAIcsf/L2Hg39tdCIGrZ1vAkLuGqou+8fq7Ukom lwZKhLZDm3/yVrLTDQsUPOcIKTBpfYK/Lsd2RIyc7gtQGqjEAraA0PjnCefsIy7mUFzDvUkwZ 6SBdJNUe9g77f/30K/7bnqbzK5oe7K1UVhFi9egyDssXTi4hi9aeYodeVrgOE1bVIMrDzUXr5 9EjPt2Xb4CEclpaF6B7AOSRwsRZ4S/dcMdCq34HJCDB/3BNVxPhlkxLMDbpumONDaeBSo+ebH 6cJwd57yQjbnNGSf/d2NElc3/5P5Ju5VSDxB47UFg/w3mdNT8DIRLdRo8B/a8ZmKrfkqa5OFv y+caxYZqHrOO3wX3KMrlOsHi8QigOCr8TyOB3xoOZXFqW9/fk4jkzPigdpXceG6KQNfpY1x/+ 6sxUClYH423hLKUrUXc6sPmlx+7eejEzHykSXBpyuyTpvcsiARxHRvQDT8wzRDE/jmOAS+nQl zHtNuMDsbenzJNHFjq3x+fd+kj93RQ5mVEhSKD+hSpafKpvQ0BhMW9RMaWavVltwpk/26o2nn /5zLosyryCW73sHF+phX2SRKzw5lQltarOH7XA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190618_024848_485020_C28473B7 X-CRM114-Status: GOOD ( 12.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Arnd Bergmann , Marc Zyngier , Will Deacon , Russell King , linux-kernel@vger.kernel.org, Andrew Murray , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This looks like it was copied incorrectly from arm64: In file included from /git/arm-soc/drivers/clocksource/arm_arch_timer.c:31: arch/arm/include/asm/arch_timer.h:131:1: error: control reaches end of non-void function [-Werror,-Wreturn-type] Change the type to 'void' as it should be. Fixes: 11e34eca5d0a ("clocksource/arm_arch_timer: Extract elf_hwcap use to arch-helper") Signed-off-by: Arnd Bergmann --- arch/arm/include/asm/arch_timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index ae533caec1e9..99175812d903 100644 --- a/arch/arm/include/asm/arch_timer.h +++ b/arch/arm/include/asm/arch_timer.h @@ -125,7 +125,7 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) isb(); } -static inline bool arch_timer_set_evtstrm_feature(void) +static inline void arch_timer_set_evtstrm_feature(void) { elf_hwcap |= HWCAP_EVTSTRM; }