]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI: dwc: Simplify config resource lookup
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 17 Jan 2025 23:51:19 +0000 (17:51 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 20 Jan 2025 18:39:38 +0000 (12:39 -0600)
If platform_get_resource_byname("config") fails, return error immediately
and unindent the normal path.  No functional change intended.

Link: https://lore.kernel.org/r/20250117235119.712043-1-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
drivers/pci/controller/dwc/pcie-designware-host.c

index f43753bb7888dab3ed15a40383f866e477bead2c..ffaded8f2df7bcddfbc3fcc488019e42fdf829cc 100644 (file)
@@ -436,18 +436,18 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)
                return ret;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");
-       if (res) {
-               pp->cfg0_size = resource_size(res);
-               pp->cfg0_base = res->start;
-
-               pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res);
-               if (IS_ERR(pp->va_cfg0_base))
-                       return PTR_ERR(pp->va_cfg0_base);
-       } else {
-               dev_err(dev, "Missing *config* reg space\n");
+       if (!res) {
+               dev_err(dev, "Missing \"config\" reg space\n");
                return -ENODEV;
        }
 
+       pp->cfg0_size = resource_size(res);
+       pp->cfg0_base = res->start;
+
+       pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res);
+       if (IS_ERR(pp->va_cfg0_base))
+               return PTR_ERR(pp->va_cfg0_base);
+
        bridge = devm_pci_alloc_host_bridge(dev, 0);
        if (!bridge)
                return -ENOMEM;