From patchwork Thu Nov 24 14:16:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 25578 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3426576wrr; Thu, 24 Nov 2022 06:22:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf4B2VwQtn9QqlYA9MnLE8AMLZyp7upwnXwxtBHgRcOWkBlCw95BYVTm62Et7bG5MvKQHAxW X-Received: by 2002:a17:902:ce90:b0:187:19c4:373a with SMTP id f16-20020a170902ce9000b0018719c4373amr26551476plg.163.1669299745985; Thu, 24 Nov 2022 06:22:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669299745; cv=none; d=google.com; s=arc-20160816; b=tzizXCVPW6KH268AJ/wMIL/eJMcQ8BDfeHgXv2Jdr7FoorL3TwpMLuK+4tXSpUFUit pb4avYrisM5Tim38Y36jbJ+FgYoTRs9ANsEDzvfLJEMpytdUkiVfuNznMYwvSHoZz28M w4Nzbdb2FaKQXhGJA7+BA9QcPR9U+LVRbVYWGBlWu0JOArM+tlbLHq/hcz7FYrcWCehj JbC0/YeirsOrbsjzDWNbTMKnYZqmnjTgvrhd/c1BqxZyxSR4ddIWAdqBYzcVXrMrc0E2 OoQ/AyBYZCjiOo1AIQvix3eTeyHFKgk2Jo5pBB9rul0eOjrICfGUkq9tdHTjuGr2gJO+ MM5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=vPM4GtgkPikyO8undmf32MjZA2sKaffe2O+gLIOF3sc=; b=QtqLeMH0zE6MEpnvJ4+5rB9KjBodxf9m/aQhFaf49MYlhsTHmVVHTse+mtONjlupSz NfPH0iiLNX7y1e52iu1Hb8e9VJMkFXug18EkHi9Qu+YcGdWhFepxWg+2jDhyR/MczpEX SqF0SpfJbIWFdjyls22qmcR+14vOYG48PkmWt1c5ozPIBuORckveJuNoUsfqI63JYh5W EMM1w/mHDs4ldi4+ExKFqOSeWTjPvdiUSRmTv69PghvYUldFafx+rODgJPzePT6js3h7 YBkJC91AAKYWQg0yE4V5fIUr9BFY+n+XiAPcvT0RzIy1z0YjLLUoOB3EpJaP6vbehSx4 WUhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SjjEg0E7; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w12-20020a63160c000000b0046040a85eacsi1169900pgl.538.2022.11.24.06.22.11; Thu, 24 Nov 2022 06:22:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SjjEg0E7; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229931AbiKXORE (ORCPT + 99 others); Thu, 24 Nov 2022 09:17:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230049AbiKXOQu (ORCPT ); Thu, 24 Nov 2022 09:16:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83720FFAA4; Thu, 24 Nov 2022 06:16:19 -0800 (PST) Date: Thu, 24 Nov 2022 14:16:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669299377; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vPM4GtgkPikyO8undmf32MjZA2sKaffe2O+gLIOF3sc=; b=SjjEg0E7f4JsemG0UMkRweLi+fsg+AMox6nVTViSGJEdZgxTXHbD5sBpOy66N2KpEn4PzB BtTfrfhCWFgan4P8J0iqMpXXZx2gZ7sOzslbw+bOQlsCX4vXydJrw/0PPfZ23nj1mDPHbN UjZdcXRRR7cwoxEPErfPmRKTXzVTydMk9rKMx4ZvxelCK5dKkcZFZWUNXPzuNSItAP1UhF fSO+E1eRt373Ogl0OgAuMo3r2Tp9ruKGVkUgIXMmwhpxErxScqaQbcRv6Zocts/Qvl4Pcp hyliQuVvNfr2S3mux0QcJ3cDB6al+LzkQZg81gaigBm5dJEdiOUaV96tIQJh9g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669299377; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vPM4GtgkPikyO8undmf32MjZA2sKaffe2O+gLIOF3sc=; b=3aaEAoecxa/t4n0BQgq/QvWvowA3PQZDSM7fNL947qYo+XMqodb7yr02s6lrZX8GN+Y7jX S7ux1EjQ9ffBpACw== From: "tip-bot2 for Steven Rostedt (Google)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function Cc: "Steven Rostedt (Google)" , Thomas Gleixner , Guenter Roeck , Jacob Keller , "Anna-Maria Behnsen" , Marc Zyngier , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221106212702.002251651@goodmis.org> References: <20221106212702.002251651@goodmis.org> MIME-Version: 1.0 Message-ID: <166929937647.4906.15326210430381406447.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748783998434990392?= X-GMAIL-MSGID: =?utf-8?q?1750387650277107384?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 73737a5833ace25a8408b0d3b783637cb6bf29d1 Gitweb: https://git.kernel.org/tip/73737a5833ace25a8408b0d3b783637cb6bf29d1 Author: Steven Rostedt (Google) AuthorDate: Wed, 23 Nov 2022 21:18:34 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 24 Nov 2022 15:09:10 +01:00 clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function 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 arch_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: Marc Zyngier Link: https://lkml.kernel.org/r/20221106212702.002251651@goodmis.org Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ Link: https://lore.kernel.org/r/20221110064146.981725531@goodmis.org Link: https://lore.kernel.org/r/20221123201624.574672568@linutronix.de --- drivers/clocksource/arm_arch_timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a7ff775..9c3420a 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id) return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt); } -static __always_inline int timer_shutdown(const int access, - struct clock_event_device *clk) +static __always_inline int arch_timer_shutdown(const int access, + struct clock_event_device *clk) { unsigned long ctrl; @@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(const int access, static int arch_timer_shutdown_virt(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); } static int arch_timer_shutdown_phys(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); } static int arch_timer_shutdown_virt_mem(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); } static int arch_timer_shutdown_phys_mem(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); } static __always_inline void set_next_event(const int access, unsigned long evt,