On Monday, April 28, 2025 11:43:11 PM Central European Summer Time Robert Richter wrote:
> 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>
Reviewed-by: Fabio M. De Francesco <fabio.m.de.francesco@linux.intel.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);
>