Skip to content

Commit 7ccb966

Browse files
dtorbjorn-helgaas
authored andcommitted
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/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Acked-by: Pali Rohár <[email protected]>
1 parent 9abf231 commit 7ccb966

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

drivers/pci/controller/pci-aardvark.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,20 +1859,18 @@ static int advk_pcie_probe(struct platform_device *pdev)
18591859
return ret;
18601860
}
18611861

1862-
pcie->reset_gpio = devm_gpiod_get_from_of_node(dev, dev->of_node,
1863-
"reset-gpios", 0,
1864-
GPIOD_OUT_LOW,
1865-
"pcie1-reset");
1862+
pcie->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
18661863
ret = PTR_ERR_OR_ZERO(pcie->reset_gpio);
18671864
if (ret) {
1868-
if (ret == -ENOENT) {
1869-
pcie->reset_gpio = NULL;
1870-
} else {
1871-
if (ret != -EPROBE_DEFER)
1872-
dev_err(dev, "Failed to get reset-gpio: %i\n",
1873-
ret);
1874-
return ret;
1875-
}
1865+
if (ret != -EPROBE_DEFER)
1866+
dev_err(dev, "Failed to get reset-gpio: %i\n", ret);
1867+
return ret;
1868+
}
1869+
1870+
ret = gpiod_set_consumer_name(pcie->reset_gpio, "pcie1-reset");
1871+
if (ret) {
1872+
dev_err(dev, "Failed to set reset gpio name: %d\n", ret);
1873+
return ret;
18761874
}
18771875

18781876
ret = of_pci_get_max_link_speed(dev->of_node);

0 commit comments

Comments
 (0)