github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'for-7.3/cxl-misc' into cxl-for-next

Browse Source 
cxl: Use %pe to print error pointers
This commit is contained in:
Dave Jiang 2026-08-03 10:22:31 -07:00
commit 212e015fc3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/cxl/core/port.c
View File

@ -933,11 +933,10 @@ struct cxl_port *devm_cxl_add_port(struct device *host,
parent_port = parent_dport ? parent_dport->port : NULL;
if (IS_ERR(port)) {
dev_dbg(uport_dev, "Failed to add%s%s%s: %ld\n",
dev_dbg(uport_dev, "Failed to add%s%s%s: %pe\n",
parent_port ? " port to " : "",
parent_port ? dev_name(&parent_port->dev) : "",
parent_port ? "" : " root port",
PTR_ERR(port));
parent_port ? "" : " root port", port);
} else {
dev_dbg(uport_dev, "%s added%s%s%s\n",
dev_name(&port->dev),
@ -1272,8 +1271,8 @@ struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port,
dport = __devm_cxl_add_dport(port, dport_dev, port_id,
component_reg_phys, CXL_RESOURCE_NONE);
if (IS_ERR(dport)) {
dev_dbg(dport_dev, "failed to add dport to %s: %ld\n",
dev_name(&port->dev), PTR_ERR(dport));
dev_dbg(dport_dev, "failed to add dport to %s: %pe\n",
dev_name(&port->dev), dport);
} else {
dev_dbg(dport_dev, "dport added to %s\n",
dev_name(&port->dev));
@ -1306,8 +1305,8 @@ struct cxl_dport *devm_cxl_add_rch_dport(struct cxl_port *port,
dport = __devm_cxl_add_dport(port, dport_dev, port_id,
CXL_RESOURCE_NONE, rcrb);
if (IS_ERR(dport)) {
dev_dbg(dport_dev, "failed to add RCH dport to %s: %ld\n",
dev_name(&port->dev), PTR_ERR(dport));
dev_dbg(dport_dev, "failed to add RCH dport to %s: %pe\n",
dev_name(&port->dev), dport);
} else {
dev_dbg(dport_dev, "RCH dport added to %s\n",
dev_name(&port->dev));

8
drivers/cxl/core/region.c
View File

@ -683,8 +683,8 @@ static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size)
dev_name(&cxlr->dev));
if (IS_ERR(res)) {
dev_dbg(&cxlr->dev,
"HPA allocation error (%ld) for size:%pap in %s %pr\n",
PTR_ERR(res), &size, cxlrd->res->name, cxlrd->res);
"HPA allocation error (%pe) for size:%pap in %s %pr\n",
res, &size, cxlrd->res->name, cxlrd->res);
return PTR_ERR(res);
}
@ -3770,9 +3770,9 @@ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd,
if (IS_ERR(cxlr)) {
dev_err(cxlmd->dev.parent,
"%s:%s: %s failed assign region: %ld\n",
"%s:%s: %s failed assign region: %pe\n",
dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev),
__func__, PTR_ERR(cxlr));
__func__, cxlr);
return cxlr;
}