From patchwork Thu Nov 10 06:41:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 17977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp760959wru; Wed, 9 Nov 2022 22:43:33 -0800 (PST) X-Google-Smtp-Source: AMsMyM5XD9fahIaYf0J9Ttx7HH+ih8jrAn/9rg8PN0YzQwHQMsD7SFlWbX0bY/HW5tDqYnvT8GxM X-Received: by 2002:a63:571e:0:b0:46a:e819:216c with SMTP id l30-20020a63571e000000b0046ae819216cmr1914058pgb.155.1668062612964; Wed, 09 Nov 2022 22:43:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668062612; cv=none; d=google.com; s=arc-20160816; b=Qij/kCje4Mdu9FASipS5o5iRUXckcf/U/jyFcGRl1jZ6bQywMM2DhcRVzmTgBbOkrE G5opvh83Mnb3ge4KcncauthGI/9rBDF7wE6oJkc0NqBZh+o4nIKorQh246J/qUC9Grjx bcGgWPNMEkd7yVhR/vJCG0AzH0NMe7rpKeVSiTQ+V0JD3RpvIjqQGV39wd/qFXuEYinD XE8rZqjJC3P9m2OebDYmTPwUZmxTZbeaDVudIPOGsIhGmaPeA3EeOl2AZzFGHXv8FzMR Ersyqmk7P0NCtihRVLQ07TBwGEziiVJbzhW7GGhqsNWT9JbKkryFo6rtAOr0tvvyNC0C zN4w== 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=USIGGnTLcfHeRDUrQSyUYnJHzLQZVm2DPknBnEyXSfA=; b=gwCR+D5hikK0r65Sfha+GdpB8uxS71YwMqDl6xwOIV/KdfrsZhaw09wItnDB3cD/cR RoXXhNtXUfhCBZ6LMhrnxCu10DgyTh90VI4cyVB68GkoOEF3eyrgLp3dOcYkqhChgZ0Z XMqY8V0qlHAcmQKQAlUUwancq6nPxZfVdGVgVhZwh8FebXm3EKl3+SNnMfnt4iOJpsMQ 5LKAdZ/X50SpseHQBXQcW+0YvvoTsjarFv0R8VfkP1kTVNX31P8X87NXD7AX+z7VztW7 pHeA6LA0BuoaeNy4SC2clzSLTHkn9l5hSFUth3IKQFMyhmPBCpDPTS49Tbtq8wlzRq9Z vw0Q== 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 p11-20020a1709028a8b00b00176b7e66c9asi17245096plo.155.2022.11.09.22.43.13; Wed, 09 Nov 2022 22:43:32 -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 S232586AbiKJGlp (ORCPT + 99 others); Thu, 10 Nov 2022 01:41:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231893AbiKJGl2 (ORCPT ); Thu, 10 Nov 2022 01:41:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CD0D31DCE for ; Wed, 9 Nov 2022 22:41:14 -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 04315B820DC for ; Thu, 10 Nov 2022 06:41:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EF23C433B5; Thu, 10 Nov 2022 06:41:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1ot1Fz-009EeN-0S; Thu, 10 Nov 2022 01:41:47 -0500 Message-ID: <20221110064146.981725531@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 10 Nov 2022 01:41:03 -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 v6 2/6] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function References: <20221110064101.429013735@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?1749090422013748462?= X-GMAIL-MSGID: =?utf-8?q?1749090422013748462?= 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://lkml.kernel.org/r/20221106212702.002251651@goodmis.org Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ Cc: Mark Rutland Cc: Linus Torvalds Cc: Stephen Boyd Cc: Anna-Maria Gleixner Cc: Andrew Morton Cc: Julia Lawall 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,