summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2025-10-03 12:13:20 -0500
committerBjorn Helgaas <bhelgaas@google.com>2025-10-03 12:13:20 -0500
commit93f32da3d409a29187e0bbc940a9ed619c754cce (patch)
treeda9ff1b3e2e774f64d00ab3faf506439ae71707c
parentdde4b05e26c5077d751ba1ca71aaf2d0bfa8a180 (diff)
parent882569dca6646eb3294ec048d76f9bfea1f3348f (diff)
Merge branch 'pci/controller/plda'
- Return -ENOMEM directly instead of using dev_err_probe() (Xichao Zhao) * pci/controller/plda: PCI: plda: Remove dev_err_probe() when the errno is -ENOMEM
-rw-r--r--drivers/pci/controller/plda/pcie-plda-host.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/plda/pcie-plda-host.c b/drivers/pci/controller/plda/pcie-plda-host.c
index 8e2db2e5b64b..3c2f68383010 100644
--- a/drivers/pci/controller/plda/pcie-plda-host.c
+++ b/drivers/pci/controller/plda/pcie-plda-host.c
@@ -599,8 +599,7 @@ int plda_pcie_host_init(struct plda_pcie_rp *port, struct pci_ops *ops,
bridge = devm_pci_alloc_host_bridge(dev, 0);
if (!bridge)
- return dev_err_probe(dev, -ENOMEM,
- "failed to alloc bridge\n");
+ return -ENOMEM;
if (port->host_ops && port->host_ops->host_init) {
ret = port->host_ops->host_init(port);