From nobody Wed Apr 24 22:39:37 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE03CC43217 for ; Thu, 24 Nov 2022 14:17:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbiKXORK (ORCPT ); Thu, 24 Nov 2022 09:17:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230077AbiKXOQu (ORCPT ); Thu, 24 Nov 2022 09:16:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5336EFAE95; Thu, 24 Nov 2022 06:16:20 -0800 (PST) Date: Thu, 24 Nov 2022 14:16:17 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669299378; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p9nhhOC0dmoguyhyQWVzllAlYJbOLqoahHX54fy0N1U=; b=sKwSzXc4wVjHB6HsXJtnmOVZzBz1HMrcMneALJw/J3W94LyENbe/NotcKSMt1Gs7K/lrhS 4sSs0h2kBWB6BZPQ6DEL+4IyCbG4zFJpHcM5+PF1x/uH02/+KX4yYa2/Fs//W3l/e44KJe 8KSb641i1aIIUMaG9fJMKteqdWnIBcd+0lixlbLcXeMVNpoR8jENXq0QTTzKnG5oaj3WfX uVdcJg8BOvC3QJgJxvHpQgf1WI+hWp5UFkarWARjuRksEr9O8qQ5Jd3JsAOtXYj9gpYTYA uI4x9tA/rkP39nZ1G7P/OwjboZz6kXKetEzP0J4BxNoWUUVR0i1zVv2KMSXZXA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669299378; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p9nhhOC0dmoguyhyQWVzllAlYJbOLqoahHX54fy0N1U=; b=M1E7mvJBTCVp2MhQv+qcy1B8J5oVCgWSPTgIR6H2kdJzxN3Y27qkAodaBIthhG9NRDMSjj 5YwMkB7KOBjVN8Dg== From: "tip-bot2 for Steven Rostedt (Google)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] ARM: spear: Do not use timer namespace for timer_shutdown() function Cc: "Steven Rostedt (Google)" , Thomas Gleixner , Guenter Roeck , Jacob Keller , "Anna-Maria Behnsen" , Arnd Bergmann , Viresh Kumar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221106212701.822440504@goodmis.org> References: <20221106212701.822440504@goodmis.org> MIME-Version: 1.0 Message-ID: <166929937763.4906.10502292339325011964.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: 80b55772d41d8afec68dbc4ff0368a9fe5d1f390 Gitweb: https://git.kernel.org/tip/80b55772d41d8afec68dbc4ff0368a9fe= 5d1f390 Author: Steven Rostedt (Google) AuthorDate: Wed, 23 Nov 2022 21:18:32 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 24 Nov 2022 15:09:10 +01:00 ARM: spear: Do not use timer namespace for timer_shutdown() function A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space. Rename timer_shutdown() to spear_timer_shutdown() to avoid this conflict. Signed-off-by: Steven Rostedt (Google) Signed-off-by: Thomas Gleixner Tested-by: Guenter Roeck Reviewed-by: Guenter Roeck Reviewed-by: Jacob Keller Reviewed-by: Anna-Maria Behnsen Acked-by: Arnd Bergmann Acked-by: Viresh Kumar Link: https://lkml.kernel.org/r/20221106212701.822440504@goodmis.org Link: https://lore.kernel.org/all/20221105060155.228348078@goodmis.org/ Link: https://lore.kernel.org/r/20221110064146.810953418@goodmis.org Link: https://lore.kernel.org/r/20221123201624.513863211@linutronix.de --- arch/arm/mach-spear/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index e979e21..5371c82 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -90,7 +90,7 @@ static void __init spear_clocksource_init(void) 200, 16, clocksource_mmio_readw_up); } =20 -static inline void timer_shutdown(struct clock_event_device *evt) +static inline void spear_timer_shutdown(struct clock_event_device *evt) { u16 val =3D readw(gpt_base + CR(CLKEVT)); =20 @@ -101,7 +101,7 @@ static inline void timer_shutdown(struct clock_event_de= vice *evt) =20 static int spear_shutdown(struct clock_event_device *evt) { - timer_shutdown(evt); + spear_timer_shutdown(evt); =20 return 0; } @@ -111,7 +111,7 @@ static int spear_set_oneshot(struct clock_event_device = *evt) u16 val; =20 /* stop the timer */ - timer_shutdown(evt); + spear_timer_shutdown(evt); =20 val =3D readw(gpt_base + CR(CLKEVT)); val |=3D CTRL_ONE_SHOT; @@ -126,7 +126,7 @@ static int spear_set_periodic(struct clock_event_device= *evt) u16 val; =20 /* stop the timer */ - timer_shutdown(evt); + spear_timer_shutdown(evt); =20 period =3D clk_get_rate(gpt_clk) / HZ; period >>=3D CTRL_PRESCALER16;