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.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlow...@linaro.org>
---
 drivers/pci/controller/dwc/pci-layerscape.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-layerscape.c 
b/drivers/pci/controller/dwc/pci-layerscape.c
index 
ee6f5256813374bdf656bef4f9b96e1b8760d1b5..239a05b36e8e6291b195f1253289af79f4a86d36
 100644
--- a/drivers/pci/controller/dwc/pci-layerscape.c
+++ b/drivers/pci/controller/dwc/pci-layerscape.c
@@ -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];
        }
 

-- 
2.43.0


Reply via email to