From nobody Sun Apr 5 13:12:54 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 085BD34DCD1 for ; Thu, 19 Feb 2026 17:13:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771521214; cv=none; b=O1oodlHMCkUDZ2/sM1NfTna7ryRSf6gcvb9CBCPkHxl0zN5APaiQqoaLdDn0zTDWvTAeAfRBb20gJld6c/EdYQes8EaLrNGw8vmOct1Y0mPCwDRT6Yy4GyMISwynnxRYKBLsmoh37wCohcuhlMavDbw+6CTUx15guq+8kXaruWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771521214; c=relaxed/simple; bh=kyxULOv2H236l1ucHIwcTRr5nnWT32c4Zye+wWGrJ6s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=araVMY8u3gT6z/5fNPm2pXSR8zURAkDH/ssKqhs+oyQ2QqdMJjqPT3+h2tyf8KD3iJ+l9qGGJZWbGc53IqYrOg4qd9yrA6hQ0aGJTr0Ql8FX/Rzku37LCrPHEccDOvkNKa3z0exgFu0p2DyAML5ZIAp82IA5ZuOuwzn13mVoFj8= 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=W3Bp0l3H; arc=none smtp.client-ip=209.85.210.174 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="W3Bp0l3H" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-8249fc726e9so609078b3a.2 for ; Thu, 19 Feb 2026 09:13:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771521212; x=1772126012; 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=scjH6AQBXgOEyOguxVYTHq5LOFFjJgFpmI1fsS6Z7tY=; b=W3Bp0l3HAahee6jM1ZFsDQY48RFSKlrq9I2k1a0rW5Pr8PGi0dstQu6Ye4Pwlh//36 vyUFE2XWfsxvdUjrh3kFAWNcjJgBWHineh1GaJWMURPIlIPgyKh9KrSqcYQMkdLPrG5N HlHfPj2BGJ3H+I/JXIwjZzZH9gZTEkFMPrgomSWxZq+A6igRcS7FmKMnbh6K0DudrhPM TjLf/lqvebR+svC8AoIChIaxlUlM5H6bjQrRPFHPlM9lkluXqsq4gCA3Rn9z/9kXgUza py6/waBbNlDwJ00ON8OIXF8dV0lE7aKrJ0O5hOxnT6fL0EZRJWDKp/hOMVCVXgcM4wcv da7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521212; x=1772126012; 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=scjH6AQBXgOEyOguxVYTHq5LOFFjJgFpmI1fsS6Z7tY=; b=u/ZmoOHgJw7zgQmTKRrKFrs6dQYWFzZDSxKM9UZk6DHSlyoaxNsP+7BaoeiftbX276 dPZ7qJnU0zj2DgDhIsLT37un+ihBZUPluA6YTxG3BH6g4ozKJm9b3WHEAl/MBOuELxJK 8TY2JlzLwNTywm17mQO1aeghgO3gdMxK1PzrPvgcRvliIbgG0RLol89dWeT4TbroVtOH JDzu8TI74y0ycwFkuAa/hlReYcKDbtfNoqiY2tM0/GhyTYsc3An2APJQMItn8Q4L/IfR DtfJ5B+d1l+9zG3hO3AUThiJMAe1ckDT/Ax6H4gFizenGCgPaJg0bDCZOWF0FHtFrsqd mg0Q== X-Forwarded-Encrypted: i=1; AJvYcCXCHDIm/asOr4pHDktxKlV9TqSMjA2s9GS6epG/tR/AwyLXSF6BtwiLRApnoXPbqExMZ1lCiZ7MMLtYUhA=@vger.kernel.org X-Gm-Message-State: AOJu0YyqjTm09uCWeN0CBvWS4COrHRHb8W9GNfEcFn5hrQ0zFYwrWLnq NNdpvgMbO7e4a/CFKpS00wQvqQfVi9SUWnc9Q4a2atzHyWOtJalEWygF X-Gm-Gg: AZuq6aIGRlUvt38X+YhRDlbrIqqLFXaDj28+/Z0Qyz6t2+/+cx48LxxY8ZK6MSTL16q UI90Gs3dHxmKu/Lk2ja87/Y6rwVJwBG9DZ7w8plh9p9jwJK76pOWIfmEJS0G8AJkgEmUGhFD5T7 v5wGGwV1rL5g8nBkR1lJXTiLXUbVdEMvi1zicPQ8bzkj6pVJ1G0B4bmW5fWigZ/4KakncAJU7vY MV9ZB22yrnkyA3jkHcRSO1wyBVTn88bsqK7bkwZPemJa2/dyCSqaTT8Zzv9lsdCSjc+cbXznYyQ OUW9jj9Tjawop88eKVAVTKbdDnxSQqBEA/pTopmqhqQ8JgNB/l+VQ7JNA39elosGFvjCUSu1k0G xrU2fbFdB6297p82he8dZGMsqB+vYlEaWEFkebnPdyqRbho0mAsRgjrfsFIyOckkfnEeZboGpzP yY2beVfYFouMbo+NcPoZ8mMPvrym5a6v9pcqzMwJrQTU/QUq/37r5MFwp7Gpae X-Received: by 2002:a05:6a21:1645:b0:38d:f08d:b349 with SMTP id adf61e73a8af0-394839d554cmr16555786637.43.1771521212312; Thu, 19 Feb 2026 09:13:32 -0800 (PST) Received: from name2965-Precision-7820-Tower.. ([121.185.236.165]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c6e532fa2e5sm15895002a12.26.2026.02.19.09.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:13:31 -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, zouyipeng@huawei.com, aha310510@gmail.com, linux-staging@lists.linux.dev, Jacob Keller Subject: [PATCH 5.10.y 04/15] clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function Date: Fri, 20 Feb 2026 02:12:59 +0900 Message-Id: <20260219171310.118170-5-aha310510@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260219171310.118170-1-aha310510@gmail.com> References: <20260219171310.118170-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 6e1fc2591f116dfb20b65cf27356475461d61bd8 ] 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 evt_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 Link: https://lkml.kernel.org/r/20221106212702.182883323@goodmis.org Link: https://lore.kernel.org/all/20221105060155.592778858@goodmis.org/ Link: https://lore.kernel.org/r/20221110064147.158230501@goodmis.org Link: https://lore.kernel.org/r/20221123201624.634354813@linutronix.de Signed-off-by: Jeongjun Park --- drivers/clocksource/timer-sp804.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-= sp804.c index e6a87f4af2b5..cd1916c05325 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -155,14 +155,14 @@ static irqreturn_t sp804_timer_interrupt(int irq, voi= d *dev_id) return IRQ_HANDLED; } =20 -static inline void timer_shutdown(struct clock_event_device *evt) +static inline void evt_timer_shutdown(struct clock_event_device *evt) { writel(0, common_clkevt->ctrl); } =20 static int sp804_shutdown(struct clock_event_device *evt) { - timer_shutdown(evt); + evt_timer_shutdown(evt); return 0; } =20 @@ -171,7 +171,7 @@ static int sp804_set_periodic(struct clock_event_device= *evt) unsigned long ctrl =3D TIMER_CTRL_32BIT | TIMER_CTRL_IE | TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE; =20 - timer_shutdown(evt); + evt_timer_shutdown(evt); writel(common_clkevt->reload, common_clkevt->load); writel(ctrl, common_clkevt->ctrl); return 0; --