diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-10-06 01:32:54 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-10-06 01:32:54 +0300 |
| commit | 9d17becd49d168443362e54a74eeca2b174dd70c (patch) | |
| tree | 89ac8f7e5ccfcd1cc7f37adf54df669819001fd1 /drivers/pci/controller | |
| parent | ec6daf2535083fad917e1c621a59d90b942d52f2 (diff) | |
| parent | a6b9ede1f3dfa5477791ad92d11f60f50998b689 (diff) | |
| download | linux-9d17becd49d168443362e54a74eeca2b174dd70c.tar.xz | |
Merge branch 'remotes/lorenzo/pci/apple'
- Switch from gpiod_get_from_of_node() to generic devm GPIO API (Dmitry
Torokhov)
* remotes/lorenzo/pci/apple:
PCI: apple: Do not leak reset GPIO on unbind/unload/error
Diffstat (limited to 'drivers/pci/controller')
| -rw-r--r-- | drivers/pci/controller/pcie-apple.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c index a2c3c207a04b..66f37e403a09 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -516,8 +516,8 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie, u32 stat, idx; int ret, i; - reset = gpiod_get_from_of_node(np, "reset-gpios", 0, - GPIOD_OUT_LOW, "PERST#"); + reset = devm_fwnode_gpiod_get(pcie->dev, of_fwnode_handle(np), "reset", + GPIOD_OUT_LOW, "PERST#"); if (IS_ERR(reset)) return PTR_ERR(reset); |