From patchwork Sat Nov 5 06:01:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 15914 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp830396wru; Fri, 4 Nov 2022 23:06:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4RKAb7nsduB0KF/yJENI5uevDzX0ULVI8IVAYi+jERqpGJ+krn90HcEbtBooimemDgBm5I X-Received: by 2002:a05:6a00:4c93:b0:56e:55de:986e with SMTP id eb19-20020a056a004c9300b0056e55de986emr11319766pfb.42.1667628380007; Fri, 04 Nov 2022 23:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667628380; cv=none; d=google.com; s=arc-20160816; b=REkYHRNm5HYDygpT97xlZ5G5+chZ88FR1URrto/v2s60aEm0pY+o0c1/rDyQ3eCVu9 NYcrNsxObHpMqwVPjjH8jwqQeTsA0O4kI87X/UCtjlDpEcM3ErGdMDMGGqAiWdcG0DYc s4DFE7YjpLJ2JZVo04jcalFn1EnXCNWMz3XQINUz/6Kbxkc5KsQgI1voBJZqrhY3oN5D H9DCesTn7OWAvBqUb8e9aZsbrT0ZyyZ6EjMqpCc38sJLEKofnTCOBhCymX7W0PzZhW6k XFB4+qaO0VX5FKZnRoh/NWidCjprASUE9tHyspQs81LekkKv4fB4vUtDaoaC1Sw1m1FY +vNA== 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=JzESANma5z0W6PL59yuAxjlHJIxfurijGrr4aHVP3Q4=; b=tyQXL7g+34jrRYifslXX3+RSAbJe+Aea1cVz6r0cVeth8XUk8qFQftjDREt8dlCQBS eRx1iQj4Q/0uMgIeWtDLY7j8bdiO99aJCHIzVX1ogHz9ljnVFKIJz+CoMXedZyl7MbdQ qhB3uhkKi/3tGu7JbmCn6Ks6CrUMMk8CD5SwEvyb1eGetofhAgVR7SPN1JtM0XqUIFIQ BAntBbW8yNj58fLjzeDWA1527URQ0f5kMh0y+FBbSyfhu06Ir7iG2KKj13YSmGdn+I01 D1nXKenolgvR83rxB3fwhbx9A01ePlrRMlcqVrZNCHy0rF0MfHACSkvALUmevgUoi+3B KMrQ== 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 q12-20020a170902a3cc00b001837ff673d3si1732140plb.262.2022.11.04.23.06.07; Fri, 04 Nov 2022 23:06:19 -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 S230013AbiKEGDZ (ORCPT + 99 others); Sat, 5 Nov 2022 02:03:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbiKEGBf (ORCPT ); Sat, 5 Nov 2022 02:01:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7612230560; Fri, 4 Nov 2022 23:01:34 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 58488609EB; Sat, 5 Nov 2022 06:01:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5D5EC433C1; Sat, 5 Nov 2022 06:01:33 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orCFl-007P0H-3B; Sat, 05 Nov 2022 02:02:01 -0400 Message-ID: <20221105060201.829050575@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 02:01:02 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org Subject: [PATCH v4a 38/38] timers: PM: Use timer_shutdown_sync() References: <20221105060024.598488967@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?1748635095949037221?= X-GMAIL-MSGID: =?utf-8?q?1748635095949037221?= From: "Steven Rostedt (Google)" Instead of open coding making the timer look like it was not registered by setting the function pointer to NULL, call timer_shutdown_sync() that does the same thing. Link: https://lore.kernel.org/all/20221104054053.431922658@goodmis.org/ Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Pavel Machek Cc: Greg Kroah-Hartman Cc: linux-pm@vger.kernel.org Signed-off-by: Steven Rostedt (Google) --- drivers/base/power/wakeup.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 7cc0c0cf8eaa..c6d68bdcac68 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -202,12 +202,7 @@ void wakeup_source_remove(struct wakeup_source *ws) raw_spin_unlock_irqrestore(&events_lock, flags); synchronize_srcu(&wakeup_srcu); - del_timer_sync(&ws->timer); - /* - * Clear timer.function to make wakeup_source_not_registered() treat - * this wakeup source as not registered. - */ - ws->timer.function = NULL; + timer_shutdown_sync(&ws->timer); } EXPORT_SYMBOL_GPL(wakeup_source_remove);