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

7 files changed, 20 insertions, 23 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index d200b16fa95c..d88e268271d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/
diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c
index cee5f2f590e2..14a6ba4067fb 100644
--- a/drivers/pci/controller/dwc/pci-exynos.c
+++ b/drivers/pci/controller/dwc/pci-exynos.c
@@ -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;
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 8b8efa3063f5..acfbd34032a8 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -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;
         }
 
diff --git a/drivers/pci/controller/dwc/pcie-armada8k.c b/drivers/pci/controller/dwc/pcie-armada8k.c
index 3d55dc78d999..49596547e8c2 100644
--- a/drivers/pci/controller/dwc/pcie-armada8k.c
+++ b/drivers/pci/controller/dwc/pcie-armada8k.c
@@ -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))
-                        return PTR_ERR(pcie->phy[i]);
-
                 if (IS_ERR(pcie->phy[i])) {
+                        if (PTR_ERR(pcie->phy[i]) != -ENODEV)
+                                return PTR_ERR(pcie->phy[i]);
+
                         pcie->phy[i] = NULL;
                         continue;
                 }
diff --git a/drivers/pci/controller/dwc/pcie-histb.c b/drivers/pci/controller/dwc/pcie-histb.c
index 954bc2b74bbc..811b5c6d62ea 100644
--- a/drivers/pci/controller/dwc/pcie-histb.c
+++ b/drivers/pci/controller/dwc/pcie-histb.c
@@ -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;
         }
 
diff --git a/drivers/pci/controller/pcie-iproc-platform.c b/drivers/pci/controller/pcie-iproc-platform.c
index 5a3550b6bb29..9ee6200a66f4 100644
--- a/drivers/pci/controller/pcie-iproc-platform.c
+++ b/drivers/pci/controller/pcie-iproc-platform.c
@@ -93,12 +93,9 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
         pcie->need_ib_cfg = of_property_read_bool(np, "dma-ranges");
 
         /* PHY use is optional */
-        pcie->phy = devm_phy_get(dev, "pcie-phy");
-        if (IS_ERR(pcie->phy)) {
-                if (PTR_ERR(pcie->phy) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-                pcie->phy = NULL;
-        }
+        pcie->phy = devm_phy_optional_get(dev, "pcie-phy");
+        if (IS_ERR(pcie->phy))
+                return PTR_ERR(pcie->phy);
 
         ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &resources,
                                                     &iobase);
diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index 8d20f1793a61..ef8e677ce9d1 100644
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -608,29 +608,29 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip)
 
         rockchip->vpcie12v = devm_regulator_get_optional(dev, "vpcie12v");
         if (IS_ERR(rockchip->vpcie12v)) {
-                if (PTR_ERR(rockchip->vpcie12v) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
+                if (PTR_ERR(rockchip->vpcie12v) != -ENODEV)
+                        return PTR_ERR(rockchip->vpcie12v);
                 dev_info(dev, "no vpcie12v regulator found\n");
         }
 
         rockchip->vpcie3v3 = devm_regulator_get_optional(dev, "vpcie3v3");
         if (IS_ERR(rockchip->vpcie3v3)) {
-                if (PTR_ERR(rockchip->vpcie3v3) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
+                if (PTR_ERR(rockchip->vpcie3v3) != -ENODEV)
+                        return PTR_ERR(rockchip->vpcie3v3);
                 dev_info(dev, "no vpcie3v3 regulator found\n");
         }
 
         rockchip->vpcie1v8 = devm_regulator_get_optional(dev, "vpcie1v8");
         if (IS_ERR(rockchip->vpcie1v8)) {
-                if (PTR_ERR(rockchip->vpcie1v8) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
+                if (PTR_ERR(rockchip->vpcie1v8) != -ENODEV)
+                        return PTR_ERR(rockchip->vpcie1v8);
                 dev_info(dev, "no vpcie1v8 regulator found\n");
         }
 
         rockchip->vpcie0v9 = devm_regulator_get_optional(dev, "vpcie0v9");
         if (IS_ERR(rockchip->vpcie0v9)) {
-                if (PTR_ERR(rockchip->vpcie0v9) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
+                if (PTR_ERR(rockchip->vpcie0v9) != -ENODEV)
+                        return PTR_ERR(rockchip->vpcie0v9);
                 dev_info(dev, "no vpcie0v9 regulator found\n");
         }