From patchwork Wed Nov 23 20:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 25187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3008563wrr; Wed, 23 Nov 2022 12:21:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf59W1zzzz3x6jSroB6wnQw39av301Ingh1iKdsZtO2c0OFFutPCP0Pv4y50ZVstHAb01DdV X-Received: by 2002:a05:6402:d6a:b0:467:6dbf:e3e8 with SMTP id ec42-20020a0564020d6a00b004676dbfe3e8mr13124699edb.291.1669234890223; Wed, 23 Nov 2022 12:21:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669234890; cv=none; d=google.com; s=arc-20160816; b=QDEzjsRNRORh64J24clFeYgI6R7E7GGZ65N5ouSZ8jwFyQlTrQpYMGO3aYOCpQT6iA PliW+tMTzD2Bj1cXoFERd1HXQ8YHIhZ0p4tKCVm7uiHSeH9chFy4mwhXnPrkeuWLvZFT WkgL0XgnOGF19jXsB6NYiZE5A7rh6FT2kR05Nowvg4UlExl/pkBVzcN0dESZCkIAchEy kJ0Ky6n9hd/7b8Uhc9UuOgSKy9wy9RxiJ7kExQmdPUw8rrzLD0HPBN+LEhOBnT2tbv2f 2a97V9olE1WwYhOFHvAG2TCHnaoTiKKjlUQpM+CVzlizelBcIdREPKguIgFfQ5ywgAXC yoUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=0NUwUCeX+kvHtS//T3Lp+EdmyILxL/lwp+ttkdi+bV8=; b=PB8JaiFEnECpJxYJKAehAByTi4s0jRiNQsiE0cIFA8ticZawQi4B1mdFYQJUqh/RCB 27d1o8SyW7K/C8nvIdJtoz+Cb5ytQ1xUM4423bdbB4shwlqqyPc8rNBc+qSpm+hMcLEc mIg7DZo88RYct6RJH5Obj1njJNNtrxcaJLvMVA4g8A9YdC633jgtBSmRDaBl/3H7jr6z u22Z5dj8I+3PeeRA7hdICXO/MQ8tWxGaM+mCISoTHM7nsIN+YuKr0BZrh4UAnCyGVgXU rU6tp1jcbqodWLqQcleLsZySQbfgyNr2s3fyylnGJoTd+Pk7HwpS4EInhE7sDveAswwt X3sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PyDJWAMW; dkim=neutral (no key) header.i=@linutronix.de header.b=XgBV1Mti; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b8-20020a056402350800b0043dfc949d31si15974155edd.25.2022.11.23.12.21.03; Wed, 23 Nov 2022 12:21:30 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PyDJWAMW; dkim=neutral (no key) header.i=@linutronix.de header.b=XgBV1Mti; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239571AbiKWUUQ (ORCPT + 99 others); Wed, 23 Nov 2022 15:20:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239044AbiKWUTl (ORCPT ); Wed, 23 Nov 2022 15:19:41 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ED4E8D485; Wed, 23 Nov 2022 12:18:36 -0800 (PST) Message-ID: <20221123201624.574672568@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669234715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=0NUwUCeX+kvHtS//T3Lp+EdmyILxL/lwp+ttkdi+bV8=; b=PyDJWAMWivv516Xl7tCFqStLetZKAGDN9pcd+jVyzp0dAz1wqDJwb3LsA80GQeki4ekCut CsLp1BL0VBpXX8n+IRAh5+u8VvVAgQTXzAiQCRiurbTVs/GOuAYh8ICNqAYiC8gYQASOll txxuL1Xrqmmb1Io0k8g3Lf09Vr6lruXYzrQaIGloN/djmoJ4KLwvYXv8cxLJ+830eXu6KL XkRmswJMHEw0F/WVqS3771o57ZwEYUaDIYKenJz+Fh4iEh7ZY7tkgb3hqdJVZ7BBtMehe9 A/2rdFe/v2JmVaTx5yleYEH+tsHThN22LcAGYFVeF0ocYK8PZ5L4bwLg5K9J/g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669234715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=0NUwUCeX+kvHtS//T3Lp+EdmyILxL/lwp+ttkdi+bV8=; b=XgBV1MtiBcYw9cOHfc2ILPTLwvzDsMIPqmEpftaoe89V4T27xWKXayuAc8BLmBFGC+nfjB QXUyWMBYijklceBw== From: Thomas Gleixner To: LKML Cc: Linus Torvalds , Steven Rostedt , Anna-Maria Behnsen , Peter Zijlstra , Stephen Boyd , Guenter Roeck , Andrew Morton , Julia Lawall , Arnd Bergmann , Viresh Kumar , Marc Zyngier , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, Jacob Keller Subject: [patch V3 03/17] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function References: <20221123201306.823305113@linutronix.de> MIME-Version: 1.0 Date: Wed, 23 Nov 2022 21:18:34 +0100 (CET) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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?1750319644012344558?= X-GMAIL-MSGID: =?utf-8?q?1750319644012344558?= 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. Signed-off-by: Steven Rostedt (Google) Signed-off-by: Thomas Gleixner Tested-by: Guenter Roeck Reviewed-by: Guenter Roeck Reviewed-by: Jacob Keller Acked-by: Marc Zyngier Link: https://lkml.kernel.org/r/20221106212702.002251651@goodmis.org Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ Link: https://lore.kernel.org/r/20221110064146.981725531@goodmis.org --- 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,