From nobody Fri Dec 19 14:02:06 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 44F442F60BC for ; Fri, 10 Oct 2025 15:03:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760108591; cv=none; b=nngaPbaArDyiaA+D7tBKbb1UwPqoHZR4LLXbX47FxQaHY8DgnfX/MhgCzWhYiDaWtEful8WepP65DtCX3tU5XYWyXxtHob6qUkT5iVBGGhZ6sRAYsHhfQJYxZ8rXIRDnXH2Oxo+oigI7ojC8ApxeUSPIJeGLwbhVz3UM/ynHqq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760108591; c=relaxed/simple; bh=FgQfbLiyDT66S+sNI1wE/oslfO+pvzybNJFnYppNieM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rTbStsMOTv+BxEPL6ojd1bkUlRIGTtXFLErb5zIBK7By25nbCV3Vc7BUHUeGfyT6EbykV6X/WXLoEr2WSUDgfpJyhrmkaiQfxXQFzKCtbYpwD7YCgKk98SJxVEWxSD8Qez78SrVxQGF3VmopFZuoMwi7wkbyogWumdNNiKMHWMI= 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=RpWrckV/; arc=none smtp.client-ip=209.85.210.178 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="RpWrckV/" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-791c287c10dso2066951b3a.1 for ; Fri, 10 Oct 2025 08:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760108589; x=1760713389; 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=RpWrckV/JP7K3rBXqLxBCPZ3r+/KHE+Zva9B+hQ/IpZyvb9ML8WbUa8q/esCb2fb4y ymlmTU0QbOJlDRiqXD0JpKBUcDmkrAJ9upSO9ZF6NWWmhx3PrAPRz0Ah3/fsPaoVHi59 NK6Pizz6h/bi7LjWTOMf1lSdl/txsUs5vF0zKcEM0JFe2qYLg/eM5lPyM7TZFNMRHhe+ A+cwnS4gZ7o7opxLNINSNzjGJlHOxnFUG4cFW/LnEKqvGqV4dfjCSNYhg3zHCJv6ktl1 l1Dnju47/ug9Zv7TrKZ/cv9mld/mHDw562LCLoXgSN7COm4MzXa90Ye+NiSn/XGoHy/k ok/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760108589; x=1760713389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=89KuTptWUmkm9h+FhspeGpsBdyDf36NNXIP8b7hhqek=; b=dbAHE8UAlxg8j9qQLqRrIvXPYmd2SoQWvLhQsWybpbGgfa3frAywl77rLMc7DVf4Lk f6qG3+z3In+agAE4EiQRb1i5A4giJB4u6hebDtlvM067az4RRCr6CyrnMotvl+yjjdTk f0bbp2uXl83Gumce23SXwQNTgl7CDCuEdmLYolTsHR/7/kh9RITkVXKmnHs82wUkHG/Z YvHIcFVtfHDv2vAfZp4Cix/xanGyfn+fZXDc45CweOejv1eGSOYAnSuxjaObg3ozLb4W l08wvaSgvbLOq5z1rwsT7wua6c+zrXLl3GG8Jdxuk38knlT7didnFiKN+C9DAill4XqW UPbg== X-Forwarded-Encrypted: i=1; AJvYcCVkJIJj7T/sBYlAr9wAsiBjbP+JoCSe+V/kXg6FIc8+gKMqgB9YCmS+UV+HdTgWv1eN2j2I8ug1KIoDr38=@vger.kernel.org X-Gm-Message-State: AOJu0YwHUgBfH6mgux6R+xPzn/7wswVIGlMSKzMxUGQzayMdAikJF0je 7wyQR7TXY8LEpfgeC7lwXQycwmbztdxqsjXCrOwDyglVqSycEqmBLNJt X-Gm-Gg: ASbGncuj8fzcc122Gh2RFpOmb6fBr0x5TuZMTblTdds/vIXxLXDPMnPAwnUHV9SQpKr nUJ/QTZtLWnwTdFCYdfzMHbqYySobLK0h5h8P+h0xFTbaM9d3f6CYRDCGgRQDIfeK9bG+s1F/F7 uFK1CZr9i6mZM+YSombu2zYrysLfxzWLyWVFYD7soYSq7+r2NC/MBjG6iuzonAt0/EqlMLIbBAp DRk4av51rNNY+BeYgJXL92SMKA8bd0UHmyBIWvLY1cfJFXDJz91IOH/1m6+T2EoJY0AUjvaax49 tApvxVBiehQDhx7tdOJzjiSbhu6NqUMVB/fnoEhVsRyFZInVqcFI3VxMv96xsB1wzm4hl3nrhxb 9PveeLY7d6j/ofp35YFYkQPG2eqIe2spAaIhZfE+MXjgaCL/o7e74S+fAW3ExmIz7TTvjnXL4Xe UCuPI= X-Google-Smtp-Source: AGHT+IGEQqV4pmO4XmsOQ15F9bsuz1pxj5V/e0Gc4K06vCx6p2KIreXiVTGYqdNwaxkJG480WOWOvA== X-Received: by 2002:a05:6a21:50f:b0:32d:a8fd:396c with SMTP id adf61e73a8af0-32da8fd3980mr15459388637.35.1760108589350; Fri, 10 Oct 2025 08:03:09 -0700 (PDT) Received: from name2965-Precision-7820-Tower.. ([121.185.186.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b639cbcsm3266359b3a.18.2025.10.10.08.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 08:03:09 -0700 (PDT) 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, Jacob Keller , Jeongjun Park Subject: [PATCH 6.1.y 02/12] ARM: spear: Do not use timer namespace for timer_shutdown() function Date: Sat, 11 Oct 2025 00:02:42 +0900 Message-Id: <20251010150252.1115788-3-aha310510@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251010150252.1115788-1-aha310510@gmail.com> References: <20251010150252.1115788-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; --