Skip to content

Commit e653810

Browse files
Andi Shytiwsakernel
authored andcommitted
i2c: nomadik: Use dev_err_probe() whenever possible
Make use of dev_err_probe() in order to simplify the code and avoid printing when returning EPROBE_DEFER. Signed-off-by: Andi Shyti <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 9c7174d commit e653810

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

drivers/i2c/busses/i2c-nomadik.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,16 +1000,14 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
10001000
dev->irq = adev->irq[0];
10011001
ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,
10021002
DRIVER_NAME, dev);
1003-
if (ret) {
1004-
dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq);
1005-
return ret;
1006-
}
1003+
if (ret)
1004+
return dev_err_probe(&adev->dev, ret,
1005+
"cannot claim the irq %d\n", dev->irq);
10071006

10081007
dev->clk = devm_clk_get_enabled(&adev->dev, NULL);
1009-
if (IS_ERR(dev->clk)) {
1010-
dev_err(&adev->dev, "could enable i2c clock\n");
1011-
return PTR_ERR(dev->clk);
1012-
}
1008+
if (IS_ERR(dev->clk))
1009+
return dev_err_probe(&adev->dev, PTR_ERR(dev->clk),
1010+
"could enable i2c clock\n");
10131011

10141012
init_hw(dev);
10151013

0 commit comments

Comments
 (0)