]> www.infradead.org Git - nvme.git/commitdiff
i3c: dw: Use new *_enabled clk API
authorAniket <aniketmaurya@google.com>
Fri, 28 Jun 2024 15:46:03 +0000 (15:46 +0000)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 26 Jul 2024 12:21:29 +0000 (14:21 +0200)
Move to "enabled" variant of clk_get API. It takes care
of enable and disable calls during the probe and remove.

Signed-off-by: Aniket <aniketmaurya@google.com>
Link: https://lore.kernel.org/r/20240628154603.326075-1-aniketmaurya@google.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/i3c/master/dw-i3c-master.c

index 9aae5c8dba8de1e6dba650be7192b2eab2367e82..4e3335641dcd8c0e7eacda1fc56c4ab1fb09bd8a 100644 (file)
@@ -1450,7 +1450,7 @@ int dw_i3c_common_probe(struct dw_i3c_master *master,
        if (IS_ERR(master->regs))
                return PTR_ERR(master->regs);
 
-       master->core_clk = devm_clk_get(&pdev->dev, NULL);
+       master->core_clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(master->core_clk))
                return PTR_ERR(master->core_clk);
 
@@ -1459,10 +1459,6 @@ int dw_i3c_common_probe(struct dw_i3c_master *master,
        if (IS_ERR(master->core_rst))
                return PTR_ERR(master->core_rst);
 
-       ret = clk_prepare_enable(master->core_clk);
-       if (ret)
-               goto err_disable_core_clk;
-
        reset_control_deassert(master->core_rst);
 
        spin_lock_init(&master->xferqueue.lock);
@@ -1501,9 +1497,6 @@ int dw_i3c_common_probe(struct dw_i3c_master *master,
 err_assert_rst:
        reset_control_assert(master->core_rst);
 
-err_disable_core_clk:
-       clk_disable_unprepare(master->core_clk);
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(dw_i3c_common_probe);
@@ -1513,8 +1506,6 @@ void dw_i3c_common_remove(struct dw_i3c_master *master)
        i3c_master_unregister(&master->base);
 
        reset_control_assert(master->core_rst);
-
-       clk_disable_unprepare(master->core_clk);
 }
 EXPORT_SYMBOL_GPL(dw_i3c_common_remove);