From patchwork Sat Jun 10 06:35:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 105900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1397293vqr; Sat, 10 Jun 2023 00:18:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ANPcaPcrisI+PQ/9pj5APxVKtrWgQjqJ44o+UsOYmbVTbU+I2P9xDi3bcZdmQH+mlb/zy X-Received: by 2002:a05:6a00:2353:b0:653:91c1:161c with SMTP id j19-20020a056a00235300b0065391c1161cmr3582450pfj.16.1686381507314; Sat, 10 Jun 2023 00:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686381507; cv=none; d=google.com; s=arc-20160816; b=p9SMSuH39LWMR9UX9h6bOjgyHWCf2kXv4YBRHA8nTlh0zq8DX2fXgyh1knVT/sqM42 2EBMfXDQqVhD6A5Arv4zqt3Uemn5ib1X07+L/+X71VgZKpBR/CLi78Ju0K/me6lOLTOd 6d6a22fc0aRWECU+IQuaDH7Gx+wErkDiKKQckZs/eWdgY3kmkrpc9gwG+HMKQGMFvN4p IHUK/iKIslCtsL1CFwLX3r93BRlU1o274J5zc3udB6L2lRvswp3J8dT8jvS3ccTyTClk RUKuG1r2EKzOOpOU3ovlLIGCjFMFuB/3vrT7+PTsuSGpxEy6xLOGIzxVjIMPzi60qKas o+Uw== 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=pPNaPH2kQ5aeQYKNX6wJqvmtp7AVgu7ReO/N49bzKYU=; b=u30cAY7rQxX/IcGQ2ZHVuH7qo2MjEWIxhailbJJHf1ZKwkI2F0Cvmb6jm8d7F/+hsm D0AboHyvwVwka9t8NdlR7L0KkfFR0HCOiIOnP2cu38gTzbUV2L7pf3DlWkoJ1bvIgwPm wKxU8FmyjbK37whFbSbfmBNHi5muCz/J6WFEO0ZQJjodilxRGnFBeqv/v+PqIpfAamcK OdCQw3g8SRq1mMNHPG/SjQGxU2iZSziVk6h3U3kZSi8uR8Tt/SE+db83jpc9JNb5ca+U azVsg3twTCPulGVZOX0zp2o6JGyQhoo/MDHsq1x2B2wpd3G6MSYErFz45nr0wcnw9W6J v/Bg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k69-20020a633d48000000b005347efdfecbsi3823760pga.111.2023.06.10.00.18.14; Sat, 10 Jun 2023 00:18:27 -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 S230050AbjFJGgT (ORCPT + 99 others); Sat, 10 Jun 2023 02:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230053AbjFJGgR (ORCPT ); Sat, 10 Jun 2023 02:36:17 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9D743AB4 for ; Fri, 9 Jun 2023 23:36:15 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QdSrM18lBzTklT; Sat, 10 Jun 2023 14:35:47 +0800 (CST) Received: from huawei.com (10.175.104.170) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 10 Jun 2023 14:36:11 +0800 From: Miaohe Lin To: , , , CC: , , , , , , , Subject: [PATCH] sched/deadline: merge __dequeue_dl_entity() into its sole caller Date: Sat, 10 Jun 2023 14:35:54 +0800 Message-ID: <20230610063554.1453342-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768299175526940728?= X-GMAIL-MSGID: =?utf-8?q?1768299175526940728?= Sole caller dequeue_dl_entity() calls __dequeue_dl_entity() directly. So __dequeue_dl_entity() can be merged into its sole caller. No functional change intended. Signed-off-by: Miaohe Lin --- kernel/sched/deadline.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 7c98ca1f7300..bf1b7a33356d 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1608,7 +1608,7 @@ static void __enqueue_dl_entity(struct sched_dl_entity *dl_se) inc_dl_tasks(dl_se, dl_rq); } -static void __dequeue_dl_entity(struct sched_dl_entity *dl_se) +static void dequeue_dl_entity(struct sched_dl_entity *dl_se) { struct dl_rq *dl_rq = dl_rq_of_se(dl_se); @@ -1648,11 +1648,6 @@ enqueue_dl_entity(struct sched_dl_entity *dl_se, int flags) __enqueue_dl_entity(dl_se); } -static void dequeue_dl_entity(struct sched_dl_entity *dl_se) -{ - __dequeue_dl_entity(dl_se); -} - static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags) { if (is_dl_boosted(&p->dl)) {