Skip to content

Commit ff6fd37

Browse files
pcercueialexandrebelloni
authored andcommitted
rtc: jz4740: Use dev_err_probe()
Use dev_err_probe() where it makes sense to simplify a bit the code. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20230129120442.22858-4-paul@crapouillou.net Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent d644b13 commit ff6fd37

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

drivers/rtc/rtc-jz4740.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -329,17 +329,13 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
329329
device_init_wakeup(dev, 1);
330330

331331
ret = dev_pm_set_wake_irq(dev, irq);
332-
if (ret) {
333-
dev_err(dev, "Failed to set wake irq: %d\n", ret);
334-
return ret;
335-
}
332+
if (ret)
333+
return dev_err_probe(dev, ret, "Failed to set wake irq\n");
336334

337335
rtc->rtc = devm_rtc_allocate_device(dev);
338-
if (IS_ERR(rtc->rtc)) {
339-
ret = PTR_ERR(rtc->rtc);
340-
dev_err(dev, "Failed to allocate rtc device: %d\n", ret);
341-
return ret;
342-
}
336+
if (IS_ERR(rtc->rtc))
337+
return dev_err_probe(dev, PTR_ERR(rtc->rtc),
338+
"Failed to allocate rtc device\n");
343339

344340
rtc->rtc->ops = &jz4740_rtc_ops;
345341
rtc->rtc->range_max = U32_MAX;
@@ -356,10 +352,8 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
356352

357353
ret = devm_request_irq(dev, irq, jz4740_rtc_irq, 0,
358354
pdev->name, rtc);
359-
if (ret) {
360-
dev_err(dev, "Failed to request rtc irq: %d\n", ret);
361-
return ret;
362-
}
355+
if (ret)
356+
return dev_err_probe(dev, ret, "Failed to request rtc irq\n");
363357

364358
if (of_device_is_system_power_controller(np)) {
365359
dev_for_power_off = dev;

0 commit comments

Comments
 (0)