Skip to content

Commit df50e63

Browse files
andy-shevgregkh
authored andcommitted
pinctrl: cy8c95x0: Unify messages with help of dev_err_probe()
[ Upstream commit 0148847 ] Unify error messages that might appear during probe phase by switching to use dev_err_probe(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linusw@kernel.org> Stable-dep-of: 5ad32c3 ("pinctrl: cy8c95x0: Avoid returning positive values to user space") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 815a7b8 commit df50e63

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/pinctrl/pinctrl-cy8c95x0.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,10 +1319,8 @@ static int cy8c95x0_irq_setup(struct cy8c95x0_pinctrl *chip, int irq)
13191319

13201320
/* Read IRQ status register to clear all pending interrupts */
13211321
ret = cy8c95x0_irq_pending(chip, pending_irqs);
1322-
if (ret) {
1323-
dev_err(chip->dev, "failed to clear irq status register\n");
1324-
return ret;
1325-
}
1322+
if (ret)
1323+
return dev_err_probe(dev, ret, "failed to clear irq status register\n");
13261324

13271325
/* Mask all interrupts */
13281326
bitmap_fill(chip->irq_mask, MAX_LINE);

0 commit comments

Comments
 (0)