Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp5156937rwb; Mon, 31 Jul 2023 19:58:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlHhNLoQZmgvJew6Oa5I1y0EivzmQ+0wn0Sl8GYOKwxIZ2n7iPa3NA7rxc4KwYDfy68Clvbf X-Received: by 2002:a17:906:3299:b0:994:569b:61b8 with SMTP id 25-20020a170906329900b00994569b61b8mr1297923ejw.58.1690858705575; Mon, 31 Jul 2023 19:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690858705; cv=none; d=google.com; s=arc-20160816; b=u/A9vETW17icXnu56MTZu9VpEk4dAEtuTbT8KwQosoXGllLiT198k7L8lVFuLw8xWA +Y79UmYGsJx/UTQ8U7S8fSxX8Q6PzB48t3r6qEME46X7EiRgWso20M5jJ+vGMYIRgNA0 TJ3OLysREIEdkH5/jW20IuANkUfaXH9jEa26bWJcPz3N9eJG7HSvqxJ0ekMvLsOWsNQv C0GOQVbkA4/i38kSLoeF/2TevHpys6Qru7/evnM9gNKNiJGuGMpTY7pcg6Z+zU2M2y03 zQ79F/asSElGOILa6H4KwMP72hXoDvZA8+WYNx5UeHc+Jzosn4RnOqbNeK/yHiksCGlq C6Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=71njkDtcEnVd3faj70O+4kCZsDUEBGlcmgpOcquMBKU=; fh=AmmdxWwWYIjbxWEMJczU+2PkLhNVGta0tsZuL72ioDg=; b=zSsscBl4YaeWVCyqpIjuOjrPqt5lDGdyscaE2z6kO8133DWNM6bLxNrvhglA71czyg YyJMxW8OQ5D9EP6L3ot433iIySWrqOO5cQ65vVnELjMWaGLgTZmgbuYq8XEYS/c4lOMJ b7SMm3fJzIskjbBb83QFnfIkX6BG1ar57AxGIeNMg/pV5H7oD2Kmhcl+F7MYqUmm84Sr 2ABhu0Nbt13IUcqG0lWsWmMaxfa1ETS6EJovP3lLG5O55Rv1pw/jQ3MWteXTOdkyaOg0 Fxt7W1G4HWjV3VnoSMbpTbfxgwtYHxr/jLX/m0xlzci1+OVumvAoQ8EtJ6X/v6ZnQP3v anfQ== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u16-20020a1709064ad000b00992d0de8766si7655264ejt.913.2023.07.31.19.58.01; Mon, 31 Jul 2023 19:58:25 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230373AbjHACfR (ORCPT + 99 others); Mon, 31 Jul 2023 22:35:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbjHACfQ (ORCPT ); Mon, 31 Jul 2023 22:35:16 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BAD11BEE for ; Mon, 31 Jul 2023 19:35:15 -0700 (PDT) Received: from dggpeml500003.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RFK1c1PT4zrRs3 for ; Tue, 1 Aug 2023 10:34:12 +0800 (CST) Received: from huawei.com (10.175.103.91) by dggpeml500003.china.huawei.com (7.185.36.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 1 Aug 2023 10:35:12 +0800 From: Yu Liao To: CC: , , Subject: [PATCH -next] timer: Replace del_timer() in comments Date: Tue, 1 Aug 2023 10:32:01 +0800 Message-ID: <20230801023201.2915257-1-liaoyu15@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500003.china.huawei.com (7.185.36.200) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 Adjust del_timer() to the new preferred function name timer_delete(). Signed-off-by: Yu Liao --- kernel/time/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 63a8ce7177dd..4864fc4c7b91 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1165,10 +1165,10 @@ EXPORT_SYMBOL(mod_timer_pending); * * mod_timer(timer, expires) is equivalent to: * - * del_timer(timer); timer->expires = expires; add_timer(timer); + * timer_delete(timer); timer->expires = expires; add_timer(timer); * * mod_timer() is more efficient than the above open coded sequence. In - * case that the timer is inactive, the del_timer() part is a NOP. The + * case that the timer is inactive, the timer_delete() part is a NOP. The * timer is in any case activated with the new expiry time @expires. * * Note that if there are multiple unserialized concurrent users of the -- 2.25.1