From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73917C4332F for ; Mon, 7 Nov 2022 11:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aZyEfZ3oNp8ybgzX4Eh/2fcHhJmyYWuyi8kDtjq/WZE=; b=kk6OK2qpN7eyOY 3L5Ws3gQRuyIAozc1S5TISfOT5y0WMxwQrqZANhIHY+4pIYFAZzXdv8xjGgMZhtBWhOfNMqrojdzA ITkXpaorS7fmhPvH9FMqUjUhEKs+YscLjUBH2KI3HRJh26fJKuoq1zEazNtGQdveYlD3wrNTjwyxg oibgbeIjkPI0PEFXBVIwsr+Cql9KH4jHIrdSjr0iY+HvksuXErTb7vWReUehrC4VA8rrZvs0youZ1 YUuAP0+u8EKBgPb/AuEdaR8CIRrwiNLUBtNXiux/z1roUhcfHYmOeQXanvbke1Of2b7n//clR3zqz b+qGqYcgzpvNrj6/ByOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orzun-00E0Mg-Pa; Mon, 07 Nov 2022 11:03:41 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orzuk-00E0JJ-E1 for linux-arm-kernel@lists.infradead.org; Mon, 07 Nov 2022 11:03:40 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0CB501FB; Mon, 7 Nov 2022 03:03:40 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.69.132]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 21D9A3F73D; Mon, 7 Nov 2022 03:03:32 -0800 (PST) Date: Mon, 7 Nov 2022 11:03:29 +0000 From: Mark Rutland To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Marc Zyngier , Daniel Lezcano , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v5a 2/5] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function Message-ID: References: <20221106054535.709068702@goodmis.org> <20221106054648.549609750@goodmis.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221106054648.549609750@goodmis.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221107_030338_539786_4439B7DD X-CRM114-Status: GOOD ( 20.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sun, Nov 06, 2022 at 01:45:37AM -0400, Steven Rostedt wrote: > From: "Steven Rostedt (Google)" > > 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. > > Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ > > Cc: Mark Rutland > Cc: Marc Zyngier > Cc: Daniel Lezcano > Cc: Thomas Gleixner > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Guenter Roeck > Signed-off-by: Steven Rostedt (Google) Acked-by: Mark Rutland Mark. > --- > 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 a7ff77550e17..9c3420a0d19d 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, > -- > 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel