From: Robert Richter <rrichter@amd.com>
To: Alison Schofield <alison.schofield@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Dave Jiang <dave.jiang@intel.com>,
Davidlohr Bueso <dave@stgolabs.net>
Cc: <linux-cxl@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Gregory Price <gourry@gourry.net>,
"Fabio M. De Francesco" <fabio.m.de.francesco@linux.intel.com>,
Terry Bowman <terry.bowman@amd.com>,
Robert Richter <rrichter@amd.com>
Subject: [PATCH v5 08/14] cxl/port: Replace put_cxl_root() by a cleanup helper
Date: Mon, 28 Apr 2025 23:43:11 +0200 [thread overview]
Message-ID: <20250428214318.1682212-9-rrichter@amd.com> (raw)
In-Reply-To: <20250428214318.1682212-1-rrichter@amd.com>
Function put_cxl_root() is only used by its cleanup helper. Remove the
function entirely and only use the helper.
Signed-off-by: Robert Richter <rrichter@amd.com>
---
drivers/cxl/core/port.c | 9 ---------
drivers/cxl/cxl.h | 4 ++--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index c9087515d743..e325f08aaf32 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -1037,15 +1037,6 @@ struct cxl_root *find_cxl_root(struct cxl_port *port)
}
EXPORT_SYMBOL_NS_GPL(find_cxl_root, "CXL");
-void put_cxl_root(struct cxl_root *cxl_root)
-{
- if (!cxl_root)
- return;
-
- put_device(&cxl_root->port.dev);
-}
-EXPORT_SYMBOL_NS_GPL(put_cxl_root, "CXL");
-
static struct cxl_dport *find_dport(struct cxl_port *port, int id)
{
struct cxl_dport *dport;
diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 960efcc60476..ea06850ecaea 100644
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -737,10 +737,10 @@ struct cxl_port *devm_cxl_add_port(struct device *host,
struct cxl_root *devm_cxl_add_root(struct device *host,
const struct cxl_root_ops *ops);
struct cxl_root *find_cxl_root(struct cxl_port *port);
-void put_cxl_root(struct cxl_root *cxl_root);
-DEFINE_FREE(put_cxl_root, struct cxl_root *, if (_T) put_cxl_root(_T))
+DEFINE_FREE(put_cxl_root, struct cxl_root *, if (_T) put_device(&_T->port.dev))
DEFINE_FREE(put_cxl_port, struct cxl_port *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->dev))
+
int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd);
void cxl_bus_rescan(void);
void cxl_bus_drain(void);
--
2.39.5
next prev parent reply other threads:[~2025-04-28 21:44 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-28 21:43 [PATCH v5 00/14] cxl: Address translation support, part 1: Cleanups and refactoring Robert Richter
2025-04-28 21:43 ` [PATCH v5 01/14] cxl: Remove else after return Robert Richter
2025-04-29 1:35 ` Alison Schofield
2025-04-28 21:43 ` [PATCH v5 02/14] cxl/pci: Moving code in cxl_hdm_decode_init() Robert Richter
2025-04-28 22:07 ` Dave Jiang
2025-04-29 15:17 ` Jonathan Cameron
2025-04-28 21:43 ` [PATCH v5 03/14] cxl/pci: Add comments to cxl_hdm_decode_init() Robert Richter
2025-04-28 22:08 ` Dave Jiang
2025-04-28 21:43 ` [PATCH v5 04/14] cxl: Introduce parent_port_of() helper Robert Richter
2025-04-28 21:43 ` [PATCH v5 05/14] cxl/region: Rename function to cxl_port_pick_region_decoder() Robert Richter
2025-04-28 22:24 ` Dave Jiang
2025-04-29 15:31 ` Jonathan Cameron
2025-05-07 15:15 ` Jonathan Cameron
2025-05-05 17:20 ` Fabio M. De Francesco
2025-04-28 21:43 ` [PATCH v5 06/14] cxl/region: Avoid duplicate call of cxl_port_pick_region_decoder() Robert Richter
2025-04-28 22:28 ` Dave Jiang
2025-04-29 15:34 ` Jonathan Cameron
2025-05-05 17:51 ` Fabio M. De Francesco
2025-04-28 21:43 ` [PATCH v5 07/14] cxl/region: Move find_cxl_root() to cxl_add_to_region() Robert Richter
2025-04-28 21:43 ` Robert Richter [this message]
2025-04-28 22:27 ` [PATCH v5 08/14] cxl/port: Replace put_cxl_root() by a cleanup helper Gregory Price
2025-04-28 23:03 ` Dave Jiang
2025-04-29 15:38 ` Jonathan Cameron
2025-04-29 15:38 ` Jonathan Cameron
2025-05-05 17:55 ` Fabio M. De Francesco
2025-04-28 21:43 ` [PATCH v5 09/14] cxl/region: Factor out code to find the root decoder Robert Richter
2025-04-28 21:43 ` [PATCH v5 10/14] cxl/region: Factor out code to find a root decoder's region Robert Richter
2025-04-28 21:43 ` [PATCH v5 11/14] cxl/region: Add function to find a port's switch decoder by range Robert Richter
2025-05-05 18:18 ` Fabio M. De Francesco
2025-04-28 21:43 ` [PATCH v5 12/14] cxl/region: Add a dev_warn() on registration failure Robert Richter
2025-04-28 21:43 ` [PATCH v5 13/14] cxl/region: Add a dev_err() on missing target list entries Robert Richter
2025-04-28 21:43 ` [PATCH v5 14/14] cxl: Add a dev_dbg() when a decoder was added to a port Robert Richter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250428214318.1682212-9-rrichter@amd.com \
--to=rrichter@amd.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=fabio.m.de.francesco@linux.intel.com \
--cc=gourry@gourry.net \
--cc=ira.weiny@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=terry.bowman@amd.com \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox