Commit e4faafbf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/misc' 

  - Propagate regulator_get_optional() errors so callers can distinguish
    real errors from optional regulators that are absent (Thierry Reding)

  - Propagate devm_of_phy_get() errors so callers can distinguish
    real errors from optional PHYs that are absent (Thierry Reding)

  - Add Andrew Murray as PCI native driver reviewer (Lorenzo Pieralisi)

* remotes/lorenzo/pci/misc:
  MAINTAINERS: Add PCI native host/endpoint controllers designated reviewer
  PCI: iproc: Propagate errors for optional PHYs
  PCI: histb: Propagate errors for optional regulators
  PCI: armada8x: Propagate errors for optional PHYs
  PCI: imx6: Propagate errors for optional regulators
  PCI: exynos: Propagate errors for optional PHYs
  PCI: rockchip: Propagate errors for optional regulators
parents 8b38b5f2 716c6a22

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12442,6 +12442,7 @@ F: arch/x86/kernel/early-quirks.c 


PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

R:	Andrew Murray <andrew.murray@arm.com>

L:	linux-pci@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/

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

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) 


	ep->phy = devm_of_phy_get(dev, np, NULL);

	if (IS_ERR(ep->phy)) {

		if (PTR_ERR(ep->phy) == -EPROBE_DEFER)

		if (PTR_ERR(ep->phy) != -ENODEV)

			return PTR_ERR(ep->phy);



		ep->phy = NULL;

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

+2 −2
Original line number Diff line number Diff line
@@ -1174,8 +1174,8 @@ static int imx6_pcie_probe(struct platform_device *pdev) 


	imx6_pcie->vpcie = devm_regulator_get_optional(&pdev->dev, "vpcie");

	if (IS_ERR(imx6_pcie->vpcie)) {

		if (PTR_ERR(imx6_pcie->vpcie) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		if (PTR_ERR(imx6_pcie->vpcie) != -ENODEV)

			return PTR_ERR(imx6_pcie->vpcie);

		imx6_pcie->vpcie = NULL;

	}

drivers/pci/controller/dwc/pcie-armada8k.c

+3 −4
Original line number Diff line number Diff line
@@ -118,11 +118,10 @@ static int armada8k_pcie_setup_phys(struct armada8k_pcie *pcie) 


	for (i = 0; i < ARMADA8K_PCIE_MAX_LANES; i++) {

		pcie->phy[i] = devm_of_phy_get_by_index(dev, node, i);

		if (IS_ERR(pcie->phy[i]) &&

		    (PTR_ERR(pcie->phy[i]) == -EPROBE_DEFER))

		if (IS_ERR(pcie->phy[i])) {

			if (PTR_ERR(pcie->phy[i]) != -ENODEV)

				return PTR_ERR(pcie->phy[i]);



		if (IS_ERR(pcie->phy[i])) {

			pcie->phy[i] = NULL;

			continue;

		}

drivers/pci/controller/dwc/pcie-histb.c

+2 −2
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ static int histb_pcie_probe(struct platform_device *pdev) 


	hipcie->vpcie = devm_regulator_get_optional(dev, "vpcie");

	if (IS_ERR(hipcie->vpcie)) {

		if (PTR_ERR(hipcie->vpcie) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		if (PTR_ERR(hipcie->vpcie) != -ENODEV)

			return PTR_ERR(hipcie->vpcie);

		hipcie->vpcie = NULL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE