From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAF0831E0E1; Mon, 27 Oct 2025 19:09:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592179; cv=none; b=tHsL6uCZ0ddeQXe4jRhnIoUoEMz9dUeTYhGjbC1d8nVzIADS+ll8zh+4XwYkiY4rTlcQaYQlh/NXy6WGertDuB3zLcWs2Xg3qOZYISzNL182VYvbIjqyzbZyJeO2x8zHg7ZRi7cfYXBEZihACFnI9mc0pZKERtweQqjVfjMz7YA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592179; c=relaxed/simple; bh=1uyfziosrFxFwEF/E9ERR2yv7GzAhbxcwOuveYMtwcM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p2LwyOFs8VStcpkmuvWAEqPUQAPhs51gAQ9Y8iBKBeV0vwXb892GzCh4SN1LPkmAvaQdoHZfGwaexNurpsOBEnweQQgAw7PGYCSh6JqI4a4nMoJON3NiG0qcvK3ZGuqEgFrj4UFbo/x2UYLR+DLsJtqafjtnteGWQF6PZlg2jBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GouDuy27; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GouDuy27" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B049C4CEF1; Mon, 27 Oct 2025 19:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761592179; bh=1uyfziosrFxFwEF/E9ERR2yv7GzAhbxcwOuveYMtwcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GouDuy27sip98bkplzZohnEvHjcq9c64QoO/Onbxlm37FmQs+cF5rMFJolw5jx6C1 nC6r7rX3N/wNJlzpBcbEyd/HbDaQyNNuB5bX/yqVz6t+NxxgshiJ4L3KGce+4Dgvmd j7KUbCD4GVUaIknllglrx1mTsniWafWj6NBvoujE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Steven Rostedt (Google)" , Thomas Gleixner , Guenter Roeck , Jacob Keller , Anna-Maria Behnsen , Arnd Bergmann , Viresh Kumar , Jeongjun Park Subject: [PATCH 6.1 024/157] ARM: spear: Do not use timer namespace for timer_shutdown() function Date: Mon, 27 Oct 2025 19:34:45 +0100 Message-ID: <20251027183501.926560394@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183501.227243846@linuxfoundation.org> References: <20251027183501.227243846@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Steven Rostedt (Google)" [ Upstream commit 80b55772d41d8afec68dbc4ff0368a9fe5d1f390 ] 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 Signed-off-by: Jeongjun Park Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-spear/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -90,7 +90,7 @@ static void __init spear_clocksource_ini 200, 16, clocksource_mmio_readw_up); } -static inline void timer_shutdown(struct clock_event_device *evt) +static inline void spear_timer_shutdown(struct clock_event_device *evt) { u16 val = readw(gpt_base + CR(CLKEVT)); @@ -101,7 +101,7 @@ static inline void timer_shutdown(struct static int spear_shutdown(struct clock_event_device *evt) { - timer_shutdown(evt); + spear_timer_shutdown(evt); return 0; } @@ -111,7 +111,7 @@ static int spear_set_oneshot(struct cloc u16 val; /* stop the timer */ - timer_shutdown(evt); + spear_timer_shutdown(evt); val = readw(gpt_base + CR(CLKEVT)); val |= CTRL_ONE_SHOT; @@ -126,7 +126,7 @@ static int spear_set_periodic(struct clo u16 val; /* stop the timer */ - timer_shutdown(evt); + spear_timer_shutdown(evt); period = clk_get_rate(gpt_clk) / HZ; period >>= CTRL_PRESCALER16;