From patchwork Sun Nov 6 05:45:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1340554wru; Sat, 5 Nov 2022 22:47:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Nh87rOmg/kk2ISyW5sAc2tF30cH4zqFprqGex7nWmLB1cW/u5A0oa22Eh8E0yzXNpDspb X-Received: by 2002:a63:b12:0:b0:44a:d193:6b16 with SMTP id 18-20020a630b12000000b0044ad1936b16mr37930164pgl.604.1667713652925; Sat, 05 Nov 2022 22:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667713652; cv=none; d=google.com; s=arc-20160816; b=txmIuluxDidU1SH4+5t4kiAQWom/pqAU6efLBBKGLEGrMMQtXaINPuJ9JPJKx/edn6 7gQpTXfdG5r+60q749uPwLP/yCXTB4OqATh0kqNZwjCCZRzB9pQxDrBOh1S6YsgKOWGG z1WN7sriyTCbkrGfAJbVt2/5kSVskKuIdFXqVkaLMb1MJBTkruVDsrXv5rskKV3JO0/m P8Qt3CIAlRHWi52JovUmfW+QMGd2aU5lAIXxLVIwP3yujhTturNJ1AV+N8AVoyoEbZJF FBUmetjYPFmTTovkUHqTwv9ztc1Nmbr9DJICuy/yTX2rm6yjxxNh+5sjH/hKBin5dGH1 TECg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=IwomS+SWlPXYBH3bcm+IOY72vt5pmcyGNakXazLFJ+g=; b=dh47PsdDQQEDnLX8Ovm0/ML4woA5rrsRZtj51pwStgSJaBMxxfErvmrtxOSYHqkR27 bva55se7agccG6hMTjNMCKvV+QXHMNd+CoBnRZyURpFrv5uO41WWZvZfRWExhjQkz0BV NPwsSD5blAyGCVmiUaIJBWEEogcOi96GpWSgurWRLmIXCIgOadkQPHSpsUAEbGFufU6w 90lIANdBYcvJZTqKelDKZNFqE9FwUpZ3UCI3+WbtXb4QIg6ZmGsU6fAWjgooUwCsTZfl 62rKXx9QBI4AZRE7cuVTkP+l0qLatXX3H2ea2nigtPXz6BoK8xd/pc2FUVEGqdoZfxVa lmdA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e23-20020a656897000000b004629cd1dbb1si5583456pgt.329.2022.11.05.22.47.19; Sat, 05 Nov 2022 22:47:32 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229625AbiKFFqX (ORCPT + 99 others); Sun, 6 Nov 2022 01:46:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229525AbiKFFqW (ORCPT ); Sun, 6 Nov 2022 01:46:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7F99766A for ; Sat, 5 Nov 2022 22:46:20 -0700 (PDT) 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 CFC2260C02 for ; Sun, 6 Nov 2022 05:46:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28CA4C433B5; Sun, 6 Nov 2022 05:46:19 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orYUa-007nBc-2J; Sun, 06 Nov 2022 01:46:48 -0400 Message-ID: <20221106054648.549609750@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 06 Nov 2022 01:45:37 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Mark Rutland , Marc Zyngier , Daniel Lezcano , linux-arm-kernel@lists.infradead.org Subject: [PATCH v5a 2/5] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function References: <20221106054535.709068702@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1748724511634261006?= X-GMAIL-MSGID: =?utf-8?q?1748724511634261006?= 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: Marc Zyngier Acked-by: Mark Rutland --- 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,