From patchwork Sun Nov 6 05:45:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16071 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1340787wru; Sat, 5 Nov 2022 22:48:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM45IwKu/XvrzMI66tdgt4OcRxH/nPhTImG6sTimm6ClqP0Z4XWbdahpYErpEw6JsTVBE1UF X-Received: by 2002:a17:902:be13:b0:188:5c4d:589d with SMTP id r19-20020a170902be1300b001885c4d589dmr15505401pls.114.1667713704534; Sat, 05 Nov 2022 22:48:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667713704; cv=none; d=google.com; s=arc-20160816; b=fM4U4pYdzedSty5oN6169MrE+TB/ZejaBxtjQlzKCGNGuGRNjdTpbpUoQC2mRrR42I KCvHytTE5cd26Km9HXFa7anKtzyOEsJfRs21M68aSefZ/BTcyT6wPQriR8Bt6NpvMGvI Fg6nac9WZxdJZwmNmdTfU9GmcztHTxCk7O+kDWCT6CuwMsg6Q58oz9hUM+fjHKGtwnNy u9/YKV6lrzTZzgMa8gkLm9hJBKCdVDmPNVrzWD8l0rUtFQyyfn1Z3a3ZHkgWjwwpQ1C7 EVSp/PhdcCCpUgPXDYu/LyiNjTmpn+PYLCdcb69Jv3sT/qWU6u0340u7KuxRj+Fr6BHi FH4g== 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=peXVsuPHF0tZq4VDS5dZNKUjPg/c6JMZCLK35JppbR0=; b=pimhZLZQGHUeBT2EahzsNbVehP+pCJcvcx4Z7SULRbhjDhbXYYo+NOzgblSNOby982 ZVrwX+yvEDA2jCeYf/R18E5d7NpCXw+ab77ceRrNefgw4RaoWYyIvpNtfvgiFXu7i/Gq llJ0PhvBcRs7fwSTRqLnei+KntoPMcqY/vC4QxwHBX9/I9L3hC+a3qNorrUdPxEHFH4k xsEhzA8FnCIxtRNx/3d2iDLgdVYRFPpQvR0Pxy9nvOSXuPOb18gY6KJHgtHurtwHCxIq ZNKGqfTWpsR4MK4SQ50pi5VNiqXma4Rlf2AY3GAeRC3X80WSgv0quVivFS3GQ/ltr4Q6 ORWQ== 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 q20-20020aa78434000000b0052b75c32fd2si5061088pfn.48.2022.11.05.22.48.11; Sat, 05 Nov 2022 22:48:24 -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 S229674AbiKFFq3 (ORCPT + 99 others); Sun, 6 Nov 2022 01:46:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbiKFFqX (ORCPT ); Sun, 6 Nov 2022 01:46:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61337A18C for ; Sat, 5 Nov 2022 22:46:22 -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 ams.source.kernel.org (Postfix) with ESMTPS id D072EB80989 for ; Sun, 6 Nov 2022 05:46:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C939C43145; 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-007nCA-2t; Sun, 06 Nov 2022 01:46:48 -0400 Message-ID: <20221106054648.735411273@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 06 Nov 2022 01:45:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Daniel Lezcano Subject: [PATCH v5a 3/5] clocksource/drivers/sp804: 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?1748724565697657606?= X-GMAIL-MSGID: =?utf-8?q?1748724565697657606?= 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 evt_timer_shutdown() to avoid this conflict. Link: https://lore.kernel.org/all/20221105060155.592778858@goodmis.org/ Cc: Daniel Lezcano Cc: Thomas Gleixner Reviewed-by: Guenter Roeck Signed-off-by: Steven Rostedt (Google) --- drivers/clocksource/timer-sp804.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index e6a87f4af2b5..cd1916c05325 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -155,14 +155,14 @@ static irqreturn_t sp804_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static inline void timer_shutdown(struct clock_event_device *evt) +static inline void evt_timer_shutdown(struct clock_event_device *evt) { writel(0, common_clkevt->ctrl); } static int sp804_shutdown(struct clock_event_device *evt) { - timer_shutdown(evt); + evt_timer_shutdown(evt); return 0; } @@ -171,7 +171,7 @@ static int sp804_set_periodic(struct clock_event_device *evt) unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE | TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE; - timer_shutdown(evt); + evt_timer_shutdown(evt); writel(common_clkevt->reload, common_clkevt->load); writel(ctrl, common_clkevt->ctrl); return 0;