Commit ff6fd377 authored by Paul Cercueil's avatar Paul Cercueil Committed by Alexandre Belloni

rtc: jz4740: Use dev_err_probe()

Use dev_err_probe() where it makes sense to simplify a bit the code.
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20230129120442.22858-4-paul@crapouillou.netSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d644b133
...@@ -329,17 +329,13 @@ static int jz4740_rtc_probe(struct platform_device *pdev) ...@@ -329,17 +329,13 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
device_init_wakeup(dev, 1); device_init_wakeup(dev, 1);
ret = dev_pm_set_wake_irq(dev, irq); ret = dev_pm_set_wake_irq(dev, irq);
if (ret) { if (ret)
dev_err(dev, "Failed to set wake irq: %d\n", ret); return dev_err_probe(dev, ret, "Failed to set wake irq\n");
return ret;
}
rtc->rtc = devm_rtc_allocate_device(dev); rtc->rtc = devm_rtc_allocate_device(dev);
if (IS_ERR(rtc->rtc)) { if (IS_ERR(rtc->rtc))
ret = PTR_ERR(rtc->rtc); return dev_err_probe(dev, PTR_ERR(rtc->rtc),
dev_err(dev, "Failed to allocate rtc device: %d\n", ret); "Failed to allocate rtc device\n");
return ret;
}
rtc->rtc->ops = &jz4740_rtc_ops; rtc->rtc->ops = &jz4740_rtc_ops;
rtc->rtc->range_max = U32_MAX; rtc->rtc->range_max = U32_MAX;
...@@ -356,10 +352,8 @@ static int jz4740_rtc_probe(struct platform_device *pdev) ...@@ -356,10 +352,8 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
ret = devm_request_irq(dev, irq, jz4740_rtc_irq, 0, ret = devm_request_irq(dev, irq, jz4740_rtc_irq, 0,
pdev->name, rtc); pdev->name, rtc);
if (ret) { if (ret)
dev_err(dev, "Failed to request rtc irq: %d\n", ret); return dev_err_probe(dev, ret, "Failed to request rtc irq\n");
return ret;
}
if (of_device_is_system_power_controller(np)) { if (of_device_is_system_power_controller(np)) {
dev_for_power_off = dev; dev_for_power_off = dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment