From patchwork Thu Nov 10 06:41:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 17979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp763230wru; Wed, 9 Nov 2022 22:51:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf5FkBx2/A10dqVT+89/+8jKGX8y8jsjy6nYwvabRLowef6YlHZm2JhShQ1Lm1ERkM0Ld09q X-Received: by 2002:a50:bb67:0:b0:466:f299:bb32 with SMTP id y94-20020a50bb67000000b00466f299bb32mr3352291ede.307.1668063066705; Wed, 09 Nov 2022 22:51:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668063066; cv=none; d=google.com; s=arc-20160816; b=Z46gNR1UsTQKWMs2jGJgqjn231xfTiwcClBUkJxu8w2xgNkF2o5+Fc9SiwGZ1PtmKT 3YIR3QJoatue2QlBoChSCGtZuepBWffKCjDcs2uOJRh73IX605HjDBs8SZ11xyIoE4Ht WpZNPQptwlOmfLRfeVMtKl2+mummgJmBZQXUnYIdE0faJwjoHiiIaVvjwW21rHNpdPXd Tmr2DSZr+WTXcpvMdJI00sKvvSx8EJPo4qW1MQ3e4H+qg9UnlViu68ZKNZRvBN7MeUQp Kg1uMVpHk90X6aCjG4IvhLlT22HwOZGup1ZyRxSShx1bHU6K7iINxLubI/ecotEbal6z 6xgg== 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=hJFDSUtYL2/M/HQVNPKLcAcezOB87x2ECTQtO9QflT8=; b=A3McWavrvaynGNlF4rNyoYZNzus+2PrVeju2R/D5LbUbGnFaA4GO7cXM+5pRIxtNC5 juxWd9T4v6yBIRXIURgzqsLibL6bBB9xVTogWtd/b33vrZnm5T9TByzX0htgl4wySRCv ATZRsbGDbHelXx6NmtnTX25tl/hMYnxdo97idl9ieBFLJ6fVyRZNSif00bMppBDgMZKW KuFfNyhozAz6UnxGSkLBvyCedALjiHkPs6VecHV6NOb7SAS23FOU7WpPueHW3zddqRqq wLruWN0krm49jUT5t1ltyKRXzLK8hxr6tuAXkqZt8ef2/HdIzSm8BWQTZNclOxI+XZ5W rmwQ== 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 cr20-20020a170906d55400b007aea5ae3956si1816795ejc.820.2022.11.09.22.50.43; Wed, 09 Nov 2022 22:51:06 -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 S232631AbiKJGlv (ORCPT + 99 others); Thu, 10 Nov 2022 01:41:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232525AbiKJGl1 (ORCPT ); Thu, 10 Nov 2022 01:41:27 -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 64C6D31DD4 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 26A7CB820DD for ; Thu, 10 Nov 2022 06:41:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B83B2C43142; 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-009Eev-12; Thu, 10 Nov 2022 01:41:47 -0500 Message-ID: <20221110064147.158230501@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 10 Nov 2022 01:41:04 -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 v6 3/6] clocksource/drivers/sp804: 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?1749090898261272617?= X-GMAIL-MSGID: =?utf-8?q?1749090898261272617?= 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://lkml.kernel.org/r/20221106212702.182883323@goodmis.org Link: https://lore.kernel.org/all/20221105060155.592778858@goodmis.org/ Cc: Daniel Lezcano Cc: Linus Torvalds Cc: Stephen Boyd Cc: Anna-Maria Gleixner Cc: Andrew Morton Cc: Julia Lawall 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;