From patchwork Tue Sep 12 16:53:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 138357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp590947vqx; Tue, 12 Sep 2023 11:11:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESGba88tO2BitQhki5LsZewQkAVPtSHnIs9WvljZr3ighS6XE+m1PAdIzBgMkltnXFCJPS X-Received: by 2002:a05:6870:a196:b0:1d5:cdf7:bd95 with SMTP id a22-20020a056870a19600b001d5cdf7bd95mr343848oaf.16.1694542259722; Tue, 12 Sep 2023 11:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694542259; cv=none; d=google.com; s=arc-20160816; b=W2gwxfXFTKuOtPPCq1GZE/RhEBRLFAcxla9MDU8jDwCYRrSJEJeCBHW8G2DjRcqYUj Ao6iaZFjdqNtOEysT5PGXG6/ORvQLIqw7CczMSisr+OvjChUgEm1eEcrAoWwv03An8BG g5MLfjD81YnsogOh4qFsxRHbqIXS+L/gh57ChN5oA616y20HfJPBKqhvy9Qf/BDxJ2ex 1W/BJX4iF/OHm1f9pTIdicjnNkKqlnbvSmI6F5N6VyrL8HN80gZHcA71fGkcMeliopfA gTSoZdnEZrbBBVLfUyJMINorBnS64T5xfVQefoE3do/qINzetkK0TW6NqHyujKsn8RGT MqVA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xitQCrAfemQurCB3eIqKr+lY5yOx/ZuM8Wxg1WBLDDQ=; fh=LlpsanKMDwEloIpcuT9WIZqrC9y5abt9+YXLTD6zxw4=; b=LVYEakARpDq5vpUstJkrxgfHnPnEhZvE3Z4PCSXZ811TmhvsWOPW+C6+BLDageV9xK JprsVS54gPwJtDYDeJww+SHQEPsCXRd0/JtcE5aV6iX+k0iW+pPeVn+YjzJndx1HgAgY oH2LWzgfziB+an2cg8KfNPCtZ/k5lKy0I/xwzOp9IKCgxxou5H16qvBVtpnscIixApNF A4s5jHp4K79TXSk1ysBZ2Y7ZmKAxriTg6C1THHXwoF/+3pmgJlM6PX6uqrjQFy2qK/uI 6ACIQUnU4HGuB7s05TyYpSq6AqJnu38ZcdapF8xWHgmsOvX4NuJXbnUeaWmPQIJCPgmE Ad5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Pl7KRv0k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k69-20020a638448000000b00573fa8f2827si8152511pgd.340.2023.09.12.11.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 11:10:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Pl7KRv0k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A0813802FBA3; Tue, 12 Sep 2023 09:54:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237133AbjILQyB (ORCPT + 37 others); Tue, 12 Sep 2023 12:54:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237115AbjILQx6 (ORCPT ); Tue, 12 Sep 2023 12:53:58 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2972A170B for ; Tue, 12 Sep 2023 09:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694537635; x=1726073635; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2IedCP0iUzia28wCwNPou4hz5kxeqqUDBtslkvZspeQ=; b=Pl7KRv0k4Wq1yQm8vskoQY6KZ65jkmzUZq5hWX20OsrraXL/Ryu/5LP5 JqQb2u30dgrqWL1Ee6UTtEDFhUPo3nguAyO4zV/efARUnoyAcNQwoS0JI qLrkIXfstU9hXYb/OIWMLI1p46mX2kPzwCHaKwZdNY44czmQ36ggy1FFq JTCSV+NefD95UB5hsq2YrHtB1DWRlXaR8286+WiU751mi15+Dym0AnNyt 6BdQZA/ccbPMjZNi1EjRjw0Sw38pNYzejK9GtdpmTUZHuxhpGfdDDpOvE agz+HIQM2HftDlpr3J7F2flYJXImAZaCo+7wYqw3QjrwemxFHHuiS8Wbq g==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="358713366" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="358713366" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 09:53:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="1074615472" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="1074615472" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 12 Sep 2023 09:53:22 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 790211A7; Tue, 12 Sep 2023 19:53:21 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [resend, PATCH v1 2/3] resource: Unify next_resource() and next_resource_skip_children() Date: Tue, 12 Sep 2023 19:53:11 +0300 Message-Id: <20230912165312.402422-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230912165312.402422-1-andriy.shevchenko@linux.intel.com> References: <20230912165312.402422-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 12 Sep 2023 09:54:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776856344191147223 X-GMAIL-MSGID: 1776856344191147223 We have the next_resource() is used once and no user for the next_resource_skip_children() outside of the for_each_resource(). Unify them by adding skip_children parameter to the next_resource(). Signed-off-by: Andy Shevchenko --- kernel/resource.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 86716cd566e9..866ef3663a0b 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -56,26 +56,17 @@ struct resource_constraint { static DEFINE_RWLOCK(resource_lock); -static struct resource *next_resource(struct resource *p) +static struct resource *next_resource(struct resource *p, bool skip_children) { - if (p->child) + if (!skip_children && p->child) return p->child; while (!p->sibling && p->parent) p = p->parent; return p->sibling; } -static struct resource *next_resource_skip_children(struct resource *p) -{ - while (!p->sibling && p->parent) - p = p->parent; - return p->sibling; -} - #define for_each_resource(_root, _p, _skip_children) \ - for ((_p) = (_root)->child; (_p); \ - (_p) = (_skip_children) ? next_resource_skip_children(_p) : \ - next_resource(_p)) + for ((_p) = (_root)->child; (_p); (_p) = next_resource(_p, _skip_children)) #ifdef CONFIG_PROC_FS @@ -100,8 +91,10 @@ static void *r_start(struct seq_file *m, loff_t *pos) static void *r_next(struct seq_file *m, void *v, loff_t *pos) { struct resource *p = v; + (*pos)++; - return (void *)next_resource(p); + + return (void *)next_resource(p, false); } static void r_stop(struct seq_file *m, void *v)