PCI: layerscape: Use syscon_regmap_lookup_by_phandle_args
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sun, 12 Jan 2025 13:39:03 +0000 (14:39 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 16 Jan 2025 20:38:36 +0000 (14:38 -0600)
Use syscon_regmap_lookup_by_phandle_args() which is a wrapper over
syscon_regmap_lookup_by_phandle() combined with getting the syscon
argument.  Except simpler code this annotates within one line that given
phandle has arguments, so grepping for code would be easier.

Link: https://lore.kernel.org/r/20250112-syscon-phandle-args-pci-v1-2-fcb6ebcc0afc@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Krzysztof WilczyƄski <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Acked-by: Roy Zang <Roy.Zang@nxp.com>
drivers/pci/controller/dwc/pci-layerscape.c

index ee6f5256813374bdf656bef4f9b96e1b8760d1b5..239a05b36e8e6291b195f1253289af79f4a86d36 100644 (file)
@@ -329,7 +329,6 @@ static int ls_pcie_probe(struct platform_device *pdev)
        struct ls_pcie *pcie;
        struct resource *dbi_base;
        u32 index[2];
-       int ret;
 
        pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
        if (!pcie)
@@ -355,16 +354,15 @@ static int ls_pcie_probe(struct platform_device *pdev)
        pcie->pf_lut_base = pci->dbi_base + pcie->drvdata->pf_lut_off;
 
        if (pcie->drvdata->scfg_support) {
-               pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node, "fsl,pcie-scfg");
+               pcie->scfg =
+                       syscon_regmap_lookup_by_phandle_args(dev->of_node,
+                                                            "fsl,pcie-scfg", 2,
+                                                            index);
                if (IS_ERR(pcie->scfg)) {
                        dev_err(dev, "No syscfg phandle specified\n");
                        return PTR_ERR(pcie->scfg);
                }
 
-               ret = of_property_read_u32_array(dev->of_node, "fsl,pcie-scfg", index, 2);
-               if (ret)
-                       return ret;
-
                pcie->index = index[1];
        }