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 5D201C433FE for ; Sat, 5 Nov 2022 14:08:22 +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=kSm6I3XSGoBBRqkdOxD6DoQmNzs/katninU2cvv+qPc=; b=ymCNAb+1e+aHtJ PaAwyKYAmqdNlKrBswHgaV8gfJHmiDZi9i4vzWH3bw+bfrUnR0Ff3APlcTLKng16icnbf28qyX1cV 0hbVZY+5u6IA+/nEHTPpbQU9dqSW2Tye/kET2uiXbEXrRlgQGCfDDJrlRXXAlGk6ti8TmkvmUNcpH JiN6Mgpf2Ugwc/9srTMMbdjKqw2tfEXbravWO5WLiMOkLrjLozuv8JkeXZNZzWaHutzxvvtR3KgcM o6oQK7XSwfSxxdcauOaec/wjHve2gOgXzs3BL2lm/K7SEG9dMtvS6QKVVGOEwOZn4TL0/R+ML+ejn 03exLYJ9tbV/3HUSY+SQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orJpS-006eVn-CU; Sat, 05 Nov 2022 14:07:22 +0000 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1orJpP-006eTg-Cc for linux-arm-kernel@lists.infradead.org; Sat, 05 Nov 2022 14:07:20 +0000 Received: by mail-oi1-x236.google.com with SMTP id v81so7941334oie.5 for ; Sat, 05 Nov 2022 07:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=QBL3RU6Tyc1K9O7fYJMpWmMKy6h7ktSFbU1hgrOg5lI=; b=cjcS1O/Qh+gd/6Xzs/PzFy1+5nBlTqq/d1HaED/mRNtq682n8E5wKJx+YmNyWXF28g RMQCq1wf10ml2PZGy+yWDwCOSUZxgbrsBquJwiRyE+esA5HSLFicrhIvWj5KZkwrs9sf 3uYDNBKjaCdZ18cq4HZ8eik4dqYy99ZXla63zmhWw3Sdk9lFAzcXsXeB7trPMpdxmUPs v8WrSjBg8YteAarRxXO++c4nQyWVKYLN4yAoW5vbV8/TaZruJbWHNv2KWKZ4b2Ir7h+I zinnacfgclxjT0REk3iBWqc3r5JrEEpoINVlTSA4zW5dYFrfo8oP7HJyqfC7PHEGChOC HMMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QBL3RU6Tyc1K9O7fYJMpWmMKy6h7ktSFbU1hgrOg5lI=; b=541rbVcSGEQAH3OrVXg3ClVdmRg08CyJ6iD4MaS8ayeeu6TkQcyfNRwtqR+/Hsef7J HpkMUvZD2HH0gtgILb1vUWFIXA+aJDikcPWv3z6lNzQMzPklTGFI5phXeSdMZUhV2XtR DSiMx60Mf6mNuUdW79/d/rVEQjFd/Bxin2fx5/cZm76tpJlQJwRB/g6WUXpg4MRe2lmg PFIjCwuzQSGZ7KKBv5n5FCxT8pN4oyssktpPpUC8IKzsim1nnzBwTNmG/yJIbUuRcDkY vo7hZaXTekyvDYJs4fTHxruM258RbE4/cl5x1Ty1L4TGtc6JB+eMahoWo837GhYl3RYD tygw== X-Gm-Message-State: ACrzQf2LglDY7V0jLlX6uad4LZhnc13EEG0pA5U6ytNuqh/kDN8ZAHaa 2D83KcUrL/9+34F4m9DGG8f2f7oTNO8= X-Google-Smtp-Source: AMsMyM6Hmuotf1LGV7tNOGQBXu+QV36l8QwYJOb8BeDypnRVVWloN/B6CE7v9FihqXwJN8aOxgIOzQ== X-Received: by 2002:a05:6808:1817:b0:359:d97b:561 with SMTP id bh23-20020a056808181700b00359d97b0561mr22306718oib.10.1667657236502; Sat, 05 Nov 2022 07:07:16 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id er33-20020a056870c8a100b00131c3d4d38fsm833197oab.39.2022.11.05.07.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 07:07:14 -0700 (PDT) Date: Sat, 5 Nov 2022 07:07:13 -0700 From: Guenter Roeck To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Linus Torvalds , Thomas Gleixner , Stephen Boyd , Anna-Maria Gleixner , Andrew Morton , Mark Rutland , Marc Zyngier , 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 Message-ID: <20221105140713.GE1606271@roeck-us.net> References: <20221105060024.598488967@goodmis.org> <20221105060155.409832154@goodmis.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221105060155.409832154@goodmis.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221105_070719_451622_A0B59EAC X-CRM114-Status: GOOD ( 22.89 ) 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 Sat, Nov 05, 2022 at 02:00:27AM -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 clk_timer_shutdown() to avoid this conflict. > > 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) Same nitpick as Marc (arch_timer_shutdown), but this is POV, so Reviewed-by: Guenter Roeck > --- > 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, > -- > 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel