From patchwork Sun Nov 6 23:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1727327wru; Sun, 6 Nov 2022 15:41:36 -0800 (PST) X-Google-Smtp-Source: AMsMyM7lyVL+9iI8ZTH8g61OU/n4YC9uYdsHOwCNoKKduwcEFtBY1h7j6oxERNCgOeEZmmvjEIZD X-Received: by 2002:a17:907:70a:b0:750:bf91:caa3 with SMTP id xb10-20020a170907070a00b00750bf91caa3mr45689842ejb.711.1667778096668; Sun, 06 Nov 2022 15:41:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667778096; cv=none; d=google.com; s=arc-20160816; b=ht4il5GJYU19ITNLKbxnXzFj5slQfYcA5HLyl7LSt6U0k4IogEvUKfeN8mbBjZcK22 VQ/lNKp4G89l5insFvcm3eOv7uFmMzyb9SRpmQ1/8xKU1bXQAvUCyoare7n1vEySgm2e o4vRSsOD6zk5j5M+16X96JB+NDPdwr+L68m1yWNEt5yb4z1JGgfT+fg5uLmdS63AG4gy 0QbdrVODCZbWJWDKU94b1vhEnMYQ8qAnv86OQJs5wApZiMz1XjAZ84SLPwOXgBhh48Vy hyBrfYOCvElXTBls1ztV5aOVkT1Src9vgXyCcAr8P3jvSrx+M9GQOJzSZD+MrE5BTJXm KtpQ== 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=cDpWcvUXPwW2O9L3AOpXAOVEqntCoirr+Dg5GEf8MVR6ePa4rSxorqmKpZ4ypazP8N RN/BZQlrSrqNC4BkwoixVbyhpofaMB949wrVaP3D5X4jmlgCazFsNB3OfDQ+SUfys0di FqDAExq6HsxejytX9+GcQRevdMHc5+fIVClQ58p5JYXiSHWS97tKr1AatS3FBPPYMBNZ EJ3iyIXxEi639ZV6lYFAto1gNWKZJmOof+UbLJ5xs5E/89Xg9oWfypQ52AswxD+XJz71 5dYsjBOA2in6ZmXMRwB2K/eTLfzdiQcMFrccTEZYvl+FQI6Ast/RCw0ZPzUfpWFtDfZq 7zEg== 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 qk44-20020a1709077fac00b007ae0ca417e4si7534843ejc.690.2022.11.06.15.41.11; Sun, 06 Nov 2022 15:41:36 -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 S230219AbiKFXeI (ORCPT + 99 others); Sun, 6 Nov 2022 18:34:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbiKFXeF (ORCPT ); Sun, 6 Nov 2022 18:34:05 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3FBCD11B for ; Sun, 6 Nov 2022 15:34:04 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 4D95E60E00 for ; Sun, 6 Nov 2022 23:34:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9105C43144; Sun, 6 Nov 2022 23:34:03 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orp9u-008UQ6-1J; Sun, 06 Nov 2022 18:34:34 -0500 Message-ID: <20221106233434.239709079@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 06 Nov 2022 18:30:40 -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: [for-linus][PATCH 3/5] clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function References: <20221106233037.815236769@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?1748792085722539774?= X-GMAIL-MSGID: =?utf-8?q?1748792085722539774?= 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;