Skip to content

Commit 8f08553

Browse files
tititiou36alexandrebelloni
authored andcommitted
rtc: k3: 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(). Based on my test with allyesconfig, this reduces the .o size from: text data bss dec hex filename 12843 4804 64 17711 452f drivers/rtc/rtc-ti-k3.o down to: 12523 4804 64 17391 43ef drivers/rtc/rtc-ti-k3.o Signed-off-by: Christophe JAILLET <[email protected]> Link: https://lore.kernel.org/r/601288834ab71c0fddde7eedd8cdb8001254ed7e.1661329498.git.christophe.jaillet@wanadoo.fr Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 94e4603 commit 8f08553

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

drivers/rtc/rtc-ti-k3.c

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -515,21 +515,12 @@ static struct nvmem_config ti_k3_rtc_nvmem_config = {
515515

516516
static int k3rtc_get_32kclk(struct device *dev, struct ti_k3_rtc *priv)
517517
{
518-
int ret;
519518
struct clk *clk;
520519

521-
clk = devm_clk_get(dev, "osc32k");
520+
clk = devm_clk_get_enabled(dev, "osc32k");
522521
if (IS_ERR(clk))
523522
return PTR_ERR(clk);
524523

525-
ret = clk_prepare_enable(clk);
526-
if (ret)
527-
return ret;
528-
529-
ret = devm_add_action_or_reset(dev, (void (*)(void *))clk_disable_unprepare, clk);
530-
if (ret)
531-
return ret;
532-
533524
priv->rate_32k = clk_get_rate(clk);
534525

535526
/* Make sure we are exact 32k clock. Else, try to compensate delay */
@@ -544,24 +535,19 @@ static int k3rtc_get_32kclk(struct device *dev, struct ti_k3_rtc *priv)
544535
*/
545536
priv->sync_timeout_us = (u32)(DIV_ROUND_UP_ULL(1000000, priv->rate_32k) * 4);
546537

547-
return ret;
538+
return 0;
548539
}
549540

550541
static int k3rtc_get_vbusclk(struct device *dev, struct ti_k3_rtc *priv)
551542
{
552-
int ret;
553543
struct clk *clk;
554544

555545
/* Note: VBUS isn't a context clock, it is needed for hardware operation */
556-
clk = devm_clk_get(dev, "vbus");
546+
clk = devm_clk_get_enabled(dev, "vbus");
557547
if (IS_ERR(clk))
558548
return PTR_ERR(clk);
559549

560-
ret = clk_prepare_enable(clk);
561-
if (ret)
562-
return ret;
563-
564-
return devm_add_action_or_reset(dev, (void (*)(void *))clk_disable_unprepare, clk);
550+
return 0;
565551
}
566552

567553
static int ti_k3_rtc_probe(struct platform_device *pdev)

0 commit comments

Comments
 (0)