mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From c567b00cc3d73f3ce4e92126731545d177262090 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||
|
|
Date: Fri, 29 Mar 2024 12:55:22 +0200
|
||
|
|
Subject: [PATCH] pinctrl: aw9523: Make use of dev_err_probe()
|
||
|
|
|
||
|
|
Simplify the error handling in probe function by switching from
|
||
|
|
dev_err() to dev_err_probe().
|
||
|
|
|
||
|
|
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
|
||
|
|
Message-ID: <20240329105634.712457-9-andy.shevchenko@gmail.com>
|
||
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/pinctrl/pinctrl-aw9523.c | 9 +++------
|
||
|
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/pinctrl/pinctrl-aw9523.c
|
||
|
|
+++ b/drivers/pinctrl/pinctrl-aw9523.c
|
||
|
|
@@ -816,10 +816,8 @@ static int aw9523_init_irq(struct aw9523
|
||
|
|
|
||
|
|
ret = devm_request_threaded_irq(dev, irq, NULL, aw9523_irq_thread_func,
|
||
|
|
IRQF_ONESHOT, dev_name(dev), awi);
|
||
|
|
- if (ret) {
|
||
|
|
- dev_err(dev, "Failed to request irq %d\n", irq);
|
||
|
|
- return ret;
|
||
|
|
- }
|
||
|
|
+ if (ret)
|
||
|
|
+ return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq);
|
||
|
|
|
||
|
|
girq = &awi->gpio.irq;
|
||
|
|
gpio_irq_chip_set_chip(girq, &aw9523_irq_chip);
|
||
|
|
@@ -1016,8 +1014,7 @@ static int aw9523_probe(struct i2c_clien
|
||
|
|
|
||
|
|
awi->pctl = devm_pinctrl_register(dev, pdesc, awi);
|
||
|
|
if (IS_ERR(awi->pctl)) {
|
||
|
|
- ret = PTR_ERR(awi->pctl);
|
||
|
|
- dev_err(dev, "Cannot register pinctrl: %d", ret);
|
||
|
|
+ ret = dev_err_probe(dev, PTR_ERR(awi->pctl), "Cannot register pinctrl");
|
||
|
|
goto err_disable_vregs;
|
||
|
|
}
|
||
|
|
|