Commit 09b7c162 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/layerscape' 

- Simplify by using syscon_regmap_lookup_by_phandle_args() instead of
  syscon_regmap_lookup_by_phandle() followed by
  of_property_read_u32_array() (Krzysztof Kozlowski)

* pci/controller/layerscape:
  PCI: layerscape: Use syscon_regmap_lookup_by_phandle_args
parents 5b9c74b6 149fc357

drivers/pci/controller/dwc/pci-layerscape.c

+4 −6
Original line number Diff line number Diff line
@@ -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];

	}