diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
| commit | 2040cf9f59037aa8aec749363e69ead165b67b43 (patch) | |
| tree | e9c15448e841cc493bc80b9f658d7955623e86dd /drivers/mfd/arizona-core.c | |
| parent | kprobes: Set unoptimized flag after unoptimizing code (diff) | |
| parent | Linux 5.5-rc1 (diff) | |
| download | linux-dev-2040cf9f59037aa8aec749363e69ead165b67b43.tar.xz linux-dev-2040cf9f59037aa8aec749363e69ead165b67b43.zip | |
Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 4a31907a4525..f73cf76d1373 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -814,11 +814,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) int ret, i; /* Handle old non-standard DT binding */ - pdata->reset = devm_gpiod_get_from_of_node(arizona->dev, - arizona->dev->of_node, - "wlf,reset", 0, - GPIOD_OUT_LOW, - "arizona /RESET"); + pdata->reset = devm_gpiod_get(arizona->dev, "wlf,reset", GPIOD_OUT_LOW); if (IS_ERR(pdata->reset)) { ret = PTR_ERR(pdata->reset); |