From nobody Mon Dec 1 22:36:20 2025 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA1D5280318 for ; Fri, 28 Nov 2025 16:05:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764345961; cv=none; b=Nm/HqJCUAIXHQolcwPMjJwqY129wRiZj5TDtc5vwect40/tguK9zNVKrVuUxFoZ0Woj02gOk7GQ2kwh9u6Nh5qEyEgbqht+UQ+FYwxce+hHcglypr70t4nXqj2m0kfU/MzWVFTbl/4bEDTuuWne/pSCI7++IW06yZNsSleEmzmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764345961; c=relaxed/simple; bh=FgQfbLiyDT66S+sNI1wE/oslfO+pvzybNJFnYppNieM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s+JVFskdZ12dBEnpD1Xde35aghj9RkiyOFMlbCotB/cFjl8G54f0DyKBuIylYLwJDsTU82BNJ9Wdw+zcamyHA4tVDmnuyiJZYZ9HJSSVza6H/ad2TOQAks3LcKqjE3HLubsfXrFz5CBs3dPAMcX7dU6yLMcyq1D6rD/i421XA7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UVsshIDi; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UVsshIDi" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7bb3092e4d7so2101529b3a.0 for ; Fri, 28 Nov 2025 08:05:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764345958; x=1764950758; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=89KuTptWUmkm9h+FhspeGpsBdyDf36NNXIP8b7hhqek=; b=UVsshIDiMTeVetzWcr46lZWBkHx5enSo+AAFgzbi5/pbetdKdEdL2LPflg7bmTqEVO npp/7O0T+IPGSzY5kZ6nLE6nAfYVqumDxspQr4yxnoIfPHZAa992pkpNlPGAjYu9COeg sTRNThIoaXK8yNO6mJGcGzMm0TT6r0VNwsnlSj0QX+IWgiUGKdPwbee0qGuKaOQ+pATz 0/Le1ChtWm1VN3eOOKipDtUMm/XWN/4C1FroPL4oNOXgLP4wVDJjGR3TEwbtiFcGgZVo pcbVs1G9qid4+LbrxPKzNNG/C7qDgZhMS8K3iPoy2xg9P3LBAmDe4hXWg0r/yVQHVzem HNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764345958; x=1764950758; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=89KuTptWUmkm9h+FhspeGpsBdyDf36NNXIP8b7hhqek=; b=BQPJ2KxE4sWlzCs2sD3ADv4JcxH8UhK32pivTvK6EVqnjz0FPqLU9ldGtMBJBYS9lj RlEnT+UiCyZ0WtcIJ+xtN21VXGzF2SwXU0NIkDIDqYDz+e9eN+TkCYSgXueeztVpsxgX 6mmM5CH7syvGZH+dlRPfg8BgILdRi+RkUXDaMjCtVFs1JmZn/FUPulxseGzOT6yYaRF+ tf2249Zs+TIXuokJocnNLsKBVAEIBSyNIo4hJ5B7BQ8SQMwmlg89AKssY3vTqhtUYDIf a1HrKhu+BjAkXKYMtUk2cZejaJkhgflyRZ+FmNkP0khk6kIwnMzrEGdJ0jz/e2yubNnQ YZEA== X-Forwarded-Encrypted: i=1; AJvYcCUzrpAaWK0grR6AV6v45nrlyl4MeS9HvUhhJKr1603nfasblI6ZlwoqzrCzSwA2KskHbsAlpQU9uOaFbvs=@vger.kernel.org X-Gm-Message-State: AOJu0Yy46410B3qYFfS9z1PansJZ+UsgJ2WPiDBIpE107vTtc/idTdc1 xSmwcsQgqhlTMwwma8EspApw4H/D4SZcG60TWfgekgMlw3/mcA+ZEvit X-Gm-Gg: ASbGncumXYusPi8sDkEccisFwp+dSu3O7CfP1pbJD7rMLD71ydfz8dcRh2qyvpat7bh XKPl+PoKn5iy8ywbcjaCDBn6FubjjnkocHzA8FHa0qFXgJ/hMVXXI/kLx5E9PZafNTZS8cVVElG rnIhtgRKCleX1pnT2TWEtPVzw9sSNoTfSN2xx7pQxy1bGbaziQbuWI7mLwy5VbsPhmBItJ8k3mf PAy0fkR5AomkP2NITpsiThgLTkp18BRh8Cbavmwwa4nO0ZsGPQkEQqfwonlfBGRH+g7ixdGLEk2 du9MYQvU1eFmbmhaGTGcnewhD383EjnIJO4wL1Or25+F5GKriHjivauDf1+ihr5DrOgYSlkXRjp dfB3qXYHwPuCiTV94Yv50FiV4rsVtCgwgQhKn/ZsQeUyvb1k6RsPE+2T6/WujMEGZezxlXNeMPs 0KyXj+5P2U3N5HNmkAzjylyJXifLQzBIr1ljV7lg== X-Google-Smtp-Source: AGHT+IF0Q8QvQVgk/GlOhROATsy4H0jZvj77M4n2inngSNShmeeB6QTjv1ds/QlTk5r7jRniqk/a7w== X-Received: by 2002:a05:6a21:99a5:b0:35d:53dc:cb64 with SMTP id adf61e73a8af0-3614ee0a109mr30924321637.54.1764345957992; Fri, 28 Nov 2025 08:05:57 -0800 (PST) Received: from name2965-Precision-7820-Tower.. ([121.185.186.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d15f26f11fsm5408499b3a.50.2025.11.28.08.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 08:05:57 -0800 (PST) From: Jeongjun Park To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, tglx@linutronix.de, Julia.Lawall@inria.fr, akpm@linux-foundation.org, anna-maria@linutronix.de, arnd@arndb.de, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux@roeck-us.net, luiz.dentz@gmail.com, marcel@holtmann.org, maz@kernel.org, peterz@infradead.org, rostedt@goodmis.org, sboyd@kernel.org, viresh.kumar@linaro.org, aha310510@gmail.com, linux-staging@lists.linux.dev, Jacob Keller Subject: [PATCH 5.15.y 02/14] ARM: spear: Do not use timer namespace for timer_shutdown() function Date: Sat, 29 Nov 2025 01:05:27 +0900 Message-Id: <20251128160539.358938-3-aha310510@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251128160539.358938-1-aha310510@gmail.com> References: <20251128160539.358938-1-aha310510@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 e979e2197f8e..5371c824786d 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; --