Skip to content

Commit 94e4603

Browse files
tititiou36alexandrebelloni
authored andcommitted
rtc: jz4740: Use devm_clk_get_enabled() helper
The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code, the error handling paths and avoid the need of a dedicated function used with devm_add_action_or_reset(). As a side effect, some error messages are not logged anymore, so also use dev_err_probe() instead of dev_err() in case of error. At least the error code will be logged (and -EPROBE_DEFER will be filtered) Based on my test with allyesconfig, this reduces the .o size from: text data bss dec hex filename 9025 2488 128 11641 2d79 drivers/rtc/rtc-jz4740.o down to: 8267 2080 128 10475 28eb drivers/rtc/rtc-jz4740.o Signed-off-by: Christophe JAILLET <[email protected]> Acked-by: Paul Cercueil <[email protected]> Link: https://lore.kernel.org/r/af10570000d7e103d70bbea590ce8df4f8902b67.1661330532.git.christophe.jaillet@wanadoo.fr Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 24fb316 commit 94e4603

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

drivers/rtc/rtc-jz4740.c

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,6 @@ static void jz4740_rtc_power_off(void)
257257
kernel_halt();
258258
}
259259

260-
static void jz4740_rtc_clk_disable(void *data)
261-
{
262-
clk_disable_unprepare(data);
263-
}
264-
265260
static const struct of_device_id jz4740_rtc_of_match[] = {
266261
{ .compatible = "ingenic,jz4740-rtc", .data = (void *)ID_JZ4740 },
267262
{ .compatible = "ingenic,jz4760-rtc", .data = (void *)ID_JZ4760 },
@@ -329,23 +324,9 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
329324
if (IS_ERR(rtc->base))
330325
return PTR_ERR(rtc->base);
331326

332-
clk = devm_clk_get(dev, "rtc");
333-
if (IS_ERR(clk)) {
334-
dev_err(dev, "Failed to get RTC clock\n");
335-
return PTR_ERR(clk);
336-
}
337-
338-
ret = clk_prepare_enable(clk);
339-
if (ret) {
340-
dev_err(dev, "Failed to enable clock\n");
341-
return ret;
342-
}
343-
344-
ret = devm_add_action_or_reset(dev, jz4740_rtc_clk_disable, clk);
345-
if (ret) {
346-
dev_err(dev, "Failed to register devm action\n");
347-
return ret;
348-
}
327+
clk = devm_clk_get_enabled(dev, "rtc");
328+
if (IS_ERR(clk))
329+
return dev_err_probe(dev, PTR_ERR(clk), "Failed to get RTC clock\n");
349330

350331
spin_lock_init(&rtc->lock);
351332

0 commit comments

Comments
 (0)