From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78E2A25A2C7 for ; Tue, 24 Jun 2025 21:39:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750801164; cv=none; b=exEn0kOUXbT+/ELkw0vJozI3OzaAPsAGaWQ+lJdfrLRI6rsqldjxmh0EJzkuQEuKBKPEMBvojy316adr6M+SJ3FUvnAfUymzeoCaVFfRazcWyvk5SZ/lRi1YrSraGBONYvJ/srTLZj5ufkC1elvqnbXxisSBNLwk3dF6+DZBzJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750801164; c=relaxed/simple; bh=W6d3AS+61f6JQFaFwT+T1YkFDQPH1VqPmXaGydvrYdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XqonUfM5gIA4tEJlKAO6Jd8AVGayLf3HA1us22rfmyiieM72ns9a4LWCqvE4SGbCxjBQxVm1yPYbc8+tuHdsW1Ed7tEVK7klFjG2JNzy1IQHzsaFX8Xk60fjQl383Zis1IuqA9b3Y5Rdj+TeSU6rYFHcqEXsc5PAz5MNZAeBZsM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 350D9C4CEE3; Tue, 24 Jun 2025 21:39:24 +0000 (UTC) From: Dave Jiang To: linux-cxl@vger.kernel.org Cc: dave@stgolabs.net, jonathan.cameron@huawei.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com, rrichter@amd.com Subject: [PATCH v4 3/9] cxl: Add helper to reap dport Date: Tue, 24 Jun 2025 14:39:10 -0700 Message-ID: <20250624213916.1665889-4-dave.jiang@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250624213916.1665889-1-dave.jiang@intel.com> References: <20250624213916.1665889-1-dave.jiang@intel.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor the code in reap_dports() out to provide a helper function that reaps a single dport. This will be used later in the cleanup path for allocating a dport. Signed-off-by: Dave Jiang --- drivers/cxl/core/port.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index a49491c14d19..9691da831224 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1447,6 +1447,13 @@ static void delete_switch_port(struct cxl_port *port) devm_release_action(port->dev.parent, unregister_port, port); } +static void reap_dport(struct cxl_port *port, struct cxl_dport *dport) +{ + devm_release_action(&port->dev, cxl_dport_unlink, dport); + devm_release_action(&port->dev, cxl_dport_remove, dport); + devm_kfree(&port->dev, dport); +} + static void reap_dports(struct cxl_port *port) { struct cxl_dport *dport; @@ -1454,11 +1461,8 @@ static void reap_dports(struct cxl_port *port) device_lock_assert(&port->dev); - xa_for_each(&port->dports, index, dport) { - devm_release_action(&port->dev, cxl_dport_unlink, dport); - devm_release_action(&port->dev, cxl_dport_remove, dport); - devm_kfree(&port->dev, dport); - } + xa_for_each(&port->dports, index, dport) + reap_dport(port, dport); } struct detach_ctx { -- 2.49.0