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 4876831BC91; Mon, 27 Oct 2025 19:09:45 +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=1761592185; cv=none; b=SbxU+KkIMbG5TwTZCyrz8cL7XKgetyLoH6suJsuYMwhus84A6eOzYsCnodObF8Gw2+LKpz/lEkbzWmEVMCVkyCUPHn+iwqDOdqgXVfxTBf4HL627hoW30AxspTzzQPdTCu4ba9L40EM4hHAwfi+QCT5r/8V5oTPUr/fTn2nQujk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592185; c=relaxed/simple; bh=G3kNB7D1GyWXth0R3GV3cZcDv8bTVtzLU2GI6r9XXu0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrMtOI9gSPzgkB4vHVQHL1+8KUwomkMz/CbqKLswFE1BCyjOfN1fTGXXXEyIr3C8HlC3ogbvGZ86kqshaFQj+3vrZhLW2KpmgKwfrm+4KMSYS/o5dybhSK2eUmtOr9QglShxCRbqhC8tZIm4jwFKH8LeKXlGv1mys1hWSJ6Tcto= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p7yHfysJ; 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="p7yHfysJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6240C4CEFD; Mon, 27 Oct 2025 19:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761592185; bh=G3kNB7D1GyWXth0R3GV3cZcDv8bTVtzLU2GI6r9XXu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p7yHfysJotmk3PIo6t2JQcXRdlO7gTmIpCjY/OV/MqsjxQEtBvR289bpl4pLk0etn SRo5wMJ+i2IKHo1T22oe5k/dqN1xTxnU3Epc5JaGjq5zQX+hCZULRXUNKnOgFsOFvk dG3ebrrI9h5w3Fm7S0iCrrDTvI4lSiNB2qGKwsBM= 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 , Jeongjun Park Subject: [PATCH 6.1 026/157] clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function Date: Mon, 27 Oct 2025 19:34:47 +0100 Message-ID: <20251027183501.983929869@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 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 Signed-off-by: Greg Kroah-Hartman --- drivers/clocksource/timer-sp804.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -155,14 +155,14 @@ static irqreturn_t sp804_timer_interrupt return IRQ_HANDLED; } -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); } static int sp804_shutdown(struct clock_event_device *evt) { - timer_shutdown(evt); + evt_timer_shutdown(evt); return 0; } @@ -171,7 +171,7 @@ static int sp804_set_periodic(struct clo unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE | TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE; - timer_shutdown(evt); + evt_timer_shutdown(evt); writel(common_clkevt->reload, common_clkevt->load); writel(ctrl, common_clkevt->ctrl); return 0;