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 3C622C4332F for ; Sat, 5 Nov 2022 09:39:42 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:Cc:To:From :Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=N/yV3+UHkpuhahozqYAmGKtV6CbsXyn2agaISdqCyKY=; b=E+VFj20bP0JqIpSZT4qWb5UDDX BOsyomf0b2oRvJQYtddSWookyQ2ftQmQvMU11QlUAe2Cq+Ewo+0m53D1WfkserHvCsEunTcyo8jYi I8hjmLLr7SMnUm8pwLNWW2EhLLrFlIgj1Boy58wHviM1ZN7JK+ESm6dgIbQASuGKM9cFAsLgPQ6jz 7MGFP5NqjY+bySiN7dbp7l8UMoZc705aiE6uU7IAvg1gS5Gnuu2w9BZrytjlZVd9omO16P6+HYqbL cdjyCI3TlVkI4oz1WhSRu4R87ecafat7KZ0SvnXgFwcPw4MsC1b+2KJ8Rii82nOyxW5J5Xx88nm99 ZsY2CiAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orFd5-006FDo-OG; Sat, 05 Nov 2022 09:38:19 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1orFd1-006FCt-7b for linux-arm-kernel@lists.infradead.org; Sat, 05 Nov 2022 09:38:18 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EE48060B19; Sat, 5 Nov 2022 09:38:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1183CC433C1; Sat, 5 Nov 2022 09:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667641093; bh=yCWj+XA04ZTlVCdL88pc7Uvsh6vI6Qz0YyTu54vfw1A=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=anXi2ll6orx4ryxYKCwtZDuh6aIOK53d1KLpUIgnU97wD4fCGBOigJgNx1rQDfvyL K9KJKn7jfiTjyrIdlX8xuLgjiTFU7kUrW15p6wmWkB3nS18W7IK8WNQxjhpqm9t9Gc khNG1HePqtTKdrJqHWO/YtaX1Q+3GAiyPjlKJd9Xar7IJR11CXLL41KcX7YD+xPHmE nMw2+qc/n/3kqngoslnrRByN52XZKLVTWw6M/TToPuggeI9X9y0MtA1HS0RiFKoEQA rOo7WNyIEys512WiGCPh19XA52R0dZAIaHMgaUtEDNt8nVmMYEy3juR4kHsb/7wEAu Bu87s9M7jRXgQ== Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1orFcw-0041AX-H9; Sat, 05 Nov 2022 09:38:10 +0000 MIME-Version: 1.0 Date: Sat, 05 Nov 2022 09:38:10 +0000 From: Marc Zyngier To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Mark Rutland , Daniel Lezcano , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4a 03/38] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function In-Reply-To: <20221105060155.409832154@goodmis.org> References: <20221105060024.598488967@goodmis.org> <20221105060155.409832154@goodmis.org> User-Agent: Roundcube Webmail/1.4.13 Message-ID: X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: rostedt@goodmis.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, sboyd@kernel.org, linux@roeck-us.net, anna-maria@linutronix.de, akpm@linux-foundation.org, mark.rutland@arm.com, daniel.lezcano@linaro.org, linux-arm-kernel@lists.infradead.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221105_023815_402928_6DBE0802 X-CRM114-Status: GOOD ( 23.07 ) 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2022-11-05 06:00, 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 clk_timer_shutdown() to avoid this conflict. > bikeshed: s/clk_timer/arch_timer/ would make the naming consistent with the rest of the code. Thanks, M. > Cc: Mark Rutland > Cc: Marc Zyngier > Cc: Daniel Lezcano > Cc: Thomas Gleixner > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Steven Rostedt (Google) > --- > 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..c36042d6a2f8 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 clk_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 clk_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 clk_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 clk_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 clk_timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); > } > > static __always_inline void set_next_event(const int access, unsigned > long evt, -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel