From patchwork Sun Nov 6 21:24:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1683719wru; Sun, 6 Nov 2022 13:33:04 -0800 (PST) X-Google-Smtp-Source: AMsMyM50V6dK0WxEIc16JOWyWqRgtMQzYyFI/a+BTYu3fS+P+7hIfXlksjfz/dRsZvTuj3RYiPCH X-Received: by 2002:a17:906:dac3:b0:780:a242:2f14 with SMTP id xi3-20020a170906dac300b00780a2422f14mr43974351ejb.668.1667770383986; Sun, 06 Nov 2022 13:33:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667770383; cv=none; d=google.com; s=arc-20160816; b=BvzIktqmu70Qdf/kT9dQUUNm1lDauO7CxsyG58Sj6B0/kwCeSce4ZZ0jJWVC0rfM2/ 8f5yKwJQjAMOPSvnYAx/5tl4shW01VaOt/vaW5QlPHJ9/fFLyrGyiBCwSdgksVa35j4D HwFpXfQYcaBRz3L9KGCRZ3mffwkHqsVwUbfzh4RU3XzjjRRZEjFPT2Zq5RB29QDD5VNC 09eZtympmlyvoVWXwJ70SiQKCgupm64YI61Rx3c5vv4QEQaLy1hcWBdtec31ovIyLWSG t3JkAhMYKVP+EWc4SC9MIGYlI3/RtbGBY570zMQgmiUmpHZ6Xu1PMw/iX9w4HhA2sZP8 gqKQ== 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=5U/LjvGcheIUuMuweuQLhffgDwEqp6lJjuM+DRd0JBA=; b=hI4nt9N9/BseAcjsFaC8O/2Asvp9na9GymYT0mYq3bP3xIbILPPu0dco9kL102Q/pJ rZ1ifttwmQltlxMM2rwkgtPDlI+kuXR/tfkv2452jrZfEyjhGU13T4bnGRFcrDpVq47T 9gqnXITRnW1PYZbYzGkMulxqT71+VRLSzMpPBn6WFCiilH1EL1DaYv5ZLsKnP1lBwjuD uhDYkOPDgu6+4/aPstrDyJOmBbZljfdaNivIWAOoTBL2DzKUyKWkKtq97fAgDJvt3sh9 fXqFCBz4YMOcB4bkgirpwRAHQV7ao5U0YNF2RQvbi5RkkTGTR4dfSmRvHWlglF/h96gh qN7Q== 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 k22-20020aa7d8d6000000b0045878eab247si7015867eds.193.2022.11.06.13.32.39; Sun, 06 Nov 2022 13:33:03 -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; 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 S230389AbiKFV0s (ORCPT + 99 others); Sun, 6 Nov 2022 16:26:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230314AbiKFV0e (ORCPT ); Sun, 6 Nov 2022 16:26:34 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5402E7648 for ; Sun, 6 Nov 2022 13:26:34 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 049E8B80D2A for ; Sun, 6 Nov 2022 21:26:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5813C43143; Sun, 6 Nov 2022 21:26:31 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1ornAU-008Chj-0W; Sun, 06 Nov 2022 16:27:02 -0500 Message-ID: <20221106212702.002251651@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 06 Nov 2022 16:24:29 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Julia Lawall , Mark Rutland , Daniel Lezcano , linux-arm-kernel@lists.infradead.org, Marc Zyngier Subject: [PATCH v6a 2/5] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function References: <20221106212427.739928660@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?1748783998434990392?= X-GMAIL-MSGID: =?utf-8?q?1748783998434990392?= 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: Daniel Lezcano Cc: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org Acked-by: Marc Zyngier Reviewed-by: Guenter Roeck Tested-by: Guenter Roeck 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..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,