From patchwork Sun Nov 6 21:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1683687wru; Sun, 6 Nov 2022 13:32:57 -0800 (PST) X-Google-Smtp-Source: AMsMyM5fEadTU25BdICiP6FSQlBHyup14MWBqYisrxHKN8WaUQbxjrXGNkMkrJbkz+/Z/T2s1Yrd X-Received: by 2002:a17:906:65c6:b0:73c:8897:65b0 with SMTP id z6-20020a17090665c600b0073c889765b0mr45396622ejn.322.1667770377063; Sun, 06 Nov 2022 13:32:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667770377; cv=none; d=google.com; s=arc-20160816; b=kJQUvIMAa+YAwndwTphqSEIAyICQxPJpMIULkWdbjUZ8n3fyhmZwa8babjXorxl9A5 6YL3krP2+OV/uam8OWqs31xNrLbw4L5Apu+TbNRnjzzUxczNythxIx1yAjP6JQwFQttj u2U62huKeOS0GlQyT14HfAjAoZwsXFogbtBVGPF2gc4DkG/sJFO93Tr/G+mNZ5uUUBju L3EPk6jiRDY8gE5SFhfaiQxQ5GkAs0J62hgk8jrJ3UYc4PNEj0XGw3MZkIa9YuOPqd/r wJdEToIabIIGYvF6RJ2Op22+VVRwFUXJt17h3P9A+7Wn8JcYt/g3RdcS5wNYu2kV/gbK cKfA== 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=67Ll45d1F8DOPtWPNjQ0c8YiPTlJwsczzB/9UWVSbyg=; b=nVZLyl50Mnrgizn2Ib2rXd/qetTm0MIVIX8UNr+PsuYEb9JvNFfBiIAXFPSV8ueWgm iwZH9vtJ+P/tbW3ZqFCbiskiaUHEZVG8fDO7TRfMJhDT0Prsopl7BO2693n/vL6MMOZn 8J8v28II/Y/ZGy8OUsSL4fc8hu7sSN6DWHvQdoQ77bWENDgnccR56Nu77GLsCbuCKx8q gPBX1byqYVSLGfw6nM/EtTCq2GRioR1ed1msyDiQJY0045Pv2ifD/OsHDkhCFwB9AKYW Y7zL8ht/EA69hbs7iL6RAORcNHPgob+b21Zj6n05WcepF0dvatW3wKqEmdZUQRG4VSXU zFcg== 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 i10-20020a05640242ca00b004614f376c2fsi9021409edc.88.2022.11.06.13.32.33; Sun, 06 Nov 2022 13:32:57 -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 S230384AbiKFV0n (ORCPT + 99 others); Sun, 6 Nov 2022 16:26:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230326AbiKFV0f (ORCPT ); Sun, 6 Nov 2022 16:26:35 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9059110FF7 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 3B696B80D17 for ; Sun, 6 Nov 2022 21:26:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEADAC43147; 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-008CiH-17; Sun, 06 Nov 2022 16:27:02 -0500 Message-ID: <20221106212702.182883323@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 06 Nov 2022 16:24:30 -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 , Daniel Lezcano Subject: [PATCH v6a 3/5] clocksource/drivers/sp804: 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?1748783990731771582?= X-GMAIL-MSGID: =?utf-8?q?1748783990731771582?= 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 Tested-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;