Skip to content

Commit c567b00

Browse files
andy-shevlinusw
authored andcommitted
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 <[email protected]> Message-ID: <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent 6bf2708 commit c567b00

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/pinctrl/pinctrl-aw9523.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,10 +816,8 @@ static int aw9523_init_irq(struct aw9523 *awi, int irq)
816816

817817
ret = devm_request_threaded_irq(dev, irq, NULL, aw9523_irq_thread_func,
818818
IRQF_ONESHOT, dev_name(dev), awi);
819-
if (ret) {
820-
dev_err(dev, "Failed to request irq %d\n", irq);
821-
return ret;
822-
}
819+
if (ret)
820+
return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq);
823821

824822
girq = &awi->gpio.irq;
825823
gpio_irq_chip_set_chip(girq, &aw9523_irq_chip);
@@ -1016,8 +1014,7 @@ static int aw9523_probe(struct i2c_client *client)
10161014

10171015
awi->pctl = devm_pinctrl_register(dev, pdesc, awi);
10181016
if (IS_ERR(awi->pctl)) {
1019-
ret = PTR_ERR(awi->pctl);
1020-
dev_err(dev, "Cannot register pinctrl: %d", ret);
1017+
ret = dev_err_probe(dev, PTR_ERR(awi->pctl), "Cannot register pinctrl");
10211018
goto err_disable_vregs;
10221019
}
10231020

0 commit comments

Comments
 (0)