PCI: aardvark: Switch to using devm_gpiod_get_optional()

Switch the driver to the generic version of gpiod API (and away from
OF-specific variant), so that we can stop exporting
devm_gpiod_get_from_of_node().

Link: https://lore.kernel.org/r/Y3KMEZFv6dpxA+Gv@google.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Pali Rohár <pali@kernel.org>

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index ba36bbc..513d8ed 100644 (file)
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1859,20 +1859,18 @@ static int advk_pcie_probe(struct platform_device *pdev)
                return ret;
        }
 
-       pcie->reset_gpio = devm_gpiod_get_from_of_node(dev, dev->of_node,
-                                                      "reset-gpios", 0,
-                                                      GPIOD_OUT_LOW,
-                                                      "pcie1-reset");
+       pcie->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
        ret = PTR_ERR_OR_ZERO(pcie->reset_gpio);
        if (ret) {
-               if (ret == -ENOENT) {
-                       pcie->reset_gpio = NULL;
-               } else {
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(dev, "Failed to get reset-gpio: %i\n",
-                                       ret);
-                       return ret;
-               }
+               if (ret != -EPROBE_DEFER)
+                       dev_err(dev, "Failed to get reset-gpio: %i\n", ret);
+               return ret;
+       }
+
+       ret = gpiod_set_consumer_name(pcie->reset_gpio, "pcie1-reset");
+       if (ret) {
+               dev_err(dev, "Failed to set reset gpio name: %d\n", ret);
+               return ret;
        }
 
        ret = of_pci_get_max_link_speed(dev->of_node);