@@ -666,7 +666,7 @@ static int match_port_by_dport(struct device *dev, const void *data)
return cxl_find_dport_by_dev(port, data) != NULL;
}
-static struct cxl_port *find_cxl_port(struct device *dport_dev)
+static struct cxl_port *dport_find_cxl_port(struct device *dport_dev)
{
struct device *port_dev;
@@ -699,7 +699,7 @@ struct cxl_port *find_cxl_root(struct cxl_memdev *cxlmd)
if (!dport_dev)
break;
- port = find_cxl_port(dport_dev);
+ port = dport_find_cxl_port(dport_dev);
if (!port)
continue;
@@ -728,7 +728,7 @@ static void cxl_remove_ep(void *data)
if (!dport_dev)
break;
- port = find_cxl_port(dport_dev);
+ port = dport_find_cxl_port(dport_dev);
if (!port || is_cxl_root(port))
continue;
@@ -787,7 +787,7 @@ static int add_port_register_ep(struct cxl_memdev *cxlmd,
resource_size_t component_reg_phys;
int rc;
- parent_port = find_cxl_port(grandparent(dport_dev));
+ parent_port = dport_find_cxl_port(grandparent(dport_dev));
if (!parent_port) {
/*
* The root CXL port is added by the CXL platform driver, fail
@@ -811,7 +811,7 @@ static int add_port_register_ep(struct cxl_memdev *cxlmd,
goto out;
}
- port = find_cxl_port(dport_dev);
+ port = dport_find_cxl_port(dport_dev);
if (!port) {
component_reg_phys = find_component_registers(uport_dev);
port = devm_cxl_add_port(&parent_port->dev, uport_dev,
@@ -876,7 +876,7 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd)
break;
}
- port = find_cxl_port(dport_dev);
+ port = dport_find_cxl_port(dport_dev);
if (port) {
dev_dbg(&cxlmd->dev,
"found already registered port %s:%s\n",
@@ -922,7 +922,7 @@ EXPORT_SYMBOL_NS_GPL(devm_cxl_enumerate_ports, CXL);
struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd)
{
- return find_cxl_port(grandparent(&cxlmd->dev));
+ return dport_find_cxl_port(grandparent(&cxlmd->dev));
}
EXPORT_SYMBOL_NS_GPL(cxl_mem_find_port, CXL);
Needed for other things. Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> --- drivers/cxl/core/port.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)