From patchwork Thu Nov 24 14:16:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 25582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3426899wrr; Thu, 24 Nov 2022 06:23:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5aakHYVEMjG0pHtssEAP+vlyFu8XpYGy8xKfkIBZ4MpcslnvPWP9FUQaslHduIwIvSjw+7 X-Received: by 2002:aa7:c7d5:0:b0:44e:bee5:4242 with SMTP id o21-20020aa7c7d5000000b0044ebee54242mr16776891eds.128.1669299783225; Thu, 24 Nov 2022 06:23:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669299783; cv=none; d=google.com; s=arc-20160816; b=rkU1zC/khDMcZhTkNYIaOKc+PbG/to9NsiuHXGPmdS+f2Vc56sTp0nGnDUsqk7OLga F2dOi2TblYejxr4U3ar7OwDEXjjyjAphrH2ub5OfdqSI2ABwibTeKZRzt+MRBpMjsXzd CqkUWJOE7UrO8CYkkCKA6rSVSCiEDIsJ82LrEh5m5hraw4/rOVg83rHQjXA0a0jnoMSX 78NvXDHO1E1etn1mJ/iq7cUTP14Fm39r5YPzu+mhET6G2NZxhXpgi2bFzkjf7ssNxPQd m0pNrvLKh/mGPi+gHiNskR8zC53cT5Tdb4tdiI/yDmeipR66eGXmdv11XF4uKbfNtDc2 1dcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=tx74CtNFk/Yx+Hpoc9IoCAlpt4kBe48pnltjYs5IRKY=; b=CnrsASXmo8PXrDqtC9nHCuih2uPi4e7zCSKzVHq9XycfzpGEdL/gnxKy8kqOUKa5Dz 6UUKe0aR556LxM6vP8uMe0cG4HjcRbwmDD18r1Hpn8z3LjwoTIN/s+VUEyCZYxqRP4u9 IbgFEDLTMldhFr58l7PMLrkbe7ReC8A/3F2ZNFLN8Dow6atQMYawtNVh/lOae8CKcxgZ hmCfOTp5HkiXEopi0krrk9yXLkFHLQRPP0PZV0Qp1wFPdqm8CixIPhtSmjeOKZJbxty1 u5EF5/Y9zWOkIzUVOy6PuVVUoKQCk7IVerHpBVJIVKJ7ss/urI0UueajaIa06zK9g3D5 Kmig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=typKDSQx; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=T9hjyEpA; 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 oz42-20020a1709077daa00b0078d93245e23si1060517ejc.791.2022.11.24.06.22.37; Thu, 24 Nov 2022 06:23: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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=typKDSQx; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=T9hjyEpA; 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 S230407AbiKXORA (ORCPT + 99 others); Thu, 24 Nov 2022 09:17:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230182AbiKXOQS (ORCPT ); Thu, 24 Nov 2022 09:16:18 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09E7FFDD95; Thu, 24 Nov 2022 06:16:18 -0800 (PST) Date: Thu, 24 Nov 2022 14:16:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669299376; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tx74CtNFk/Yx+Hpoc9IoCAlpt4kBe48pnltjYs5IRKY=; b=typKDSQxpv9aDU3JON2E9YTSJKyh99CL5iX4LUjeLIetShV2LnmfyuwYMm8bqxjq2jmDDZ w8+S4fR6SgKvzxik1wIvPaHxMFhe3HgrwXl5T324efCa++VwWCuzgwnupZAe7NVnPWkDfX xTvfCfcfyaSYxN4fqgkZIzKRUXaU9R+2VZQ2wYhpJYVxYvthiB0O3b/szGRsM6CbhMva0q x6uDKnIUgJt7vbZB6lPE4qchnxi+7W/DPg/r1wrgBgpP3mleLa3KAHhsEmB5PnXRkI/ECk w7pgYx43nMV0GDsoK/wGY33vGDlE2qeyBAf3O6sm9I/wzKfNlxe3pUw9wx9YdA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669299376; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tx74CtNFk/Yx+Hpoc9IoCAlpt4kBe48pnltjYs5IRKY=; b=T9hjyEpAyzk7yETay6RFby8x22l9WEa8XpACc6dLuJwfz9Ks+Wc/fYZonAIOfhRZShqKyZ zxGFFyR3p07urhCA== From: "tip-bot2 for Steven Rostedt (Google)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function Cc: "Steven Rostedt (Google)" , Thomas Gleixner , Guenter Roeck , Jacob Keller , "Anna-Maria Behnsen" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221106212702.182883323@goodmis.org> References: <20221106212702.182883323@goodmis.org> MIME-Version: 1.0 Message-ID: <166929937530.4906.14514610751338024549.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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?1748783990731771582?= X-GMAIL-MSGID: =?utf-8?q?1750387689602235030?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 6e1fc2591f116dfb20b65cf27356475461d61bd8 Gitweb: https://git.kernel.org/tip/6e1fc2591f116dfb20b65cf27356475461d61bd8 Author: Steven Rostedt (Google) AuthorDate: Wed, 23 Nov 2022 21:18:36 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 24 Nov 2022 15:09:10 +01:00 clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function 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. Signed-off-by: Steven Rostedt (Google) Signed-off-by: Thomas Gleixner Tested-by: Guenter Roeck Reviewed-by: Guenter Roeck Reviewed-by: Jacob Keller Reviewed-by: Anna-Maria Behnsen Link: https://lkml.kernel.org/r/20221106212702.182883323@goodmis.org Link: https://lore.kernel.org/all/20221105060155.592778858@goodmis.org/ Link: https://lore.kernel.org/r/20221110064147.158230501@goodmis.org Link: https://lore.kernel.org/r/20221123201624.634354813@linutronix.de --- 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 e6a87f4..cd1916c 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;