i2c: xiic: Use devm_clk_get_enabled()

[ Upstream commit 8390dc7477e49e4acc9e553f385f4ff59d186efe ]

Replace the pair of functions, devm_clk_get() and clk_prepare_enable(),
with a single function devm_clk_get_enabled().

Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Acked-by: Michal Simek <michal.simek@amd.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Stable-dep-of: 0c8d604dea43 ("i2c: xiic: Fix pm_runtime_set_suspended() with runtime pm enabled")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 2642062ce5b32f28df251f0e23a94d24c999a5f6..678ec68f66d6088f1b70bfb2756b733a902027a0 100644 (file)
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -837,16 +837,11 @@ static int xiic_i2c_probe(struct platform_device *pdev)
 
        mutex_init(&i2c->lock);
 
-       i2c->clk = devm_clk_get(&pdev->dev, NULL);
+       i2c->clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(i2c->clk))
                return dev_err_probe(&pdev->dev, PTR_ERR(i2c->clk),
-                                    "input clock not found.\n");
+                                    "failed to enable input clock.\n");
 
-       ret = clk_prepare_enable(i2c->clk);
-       if (ret) {
-               dev_err(&pdev->dev, "Unable to enable clock.\n");
-               return ret;
-       }
        i2c->dev = &pdev->dev;
        pm_runtime_set_autosuspend_delay(i2c->dev, XIIC_PM_TIMEOUT);
        pm_runtime_use_autosuspend(i2c->dev);
@@ -858,7 +853,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
 
        if (ret < 0) {
                dev_err(&pdev->dev, "Cannot claim IRQ\n");
-               goto err_clk_dis;
+               goto err_pm_disable;
        }
 
        i2c->singlemaster =
@@ -879,14 +874,14 @@ static int xiic_i2c_probe(struct platform_device *pdev)
        ret = xiic_reinit(i2c);
        if (ret < 0) {
                dev_err(&pdev->dev, "Cannot xiic_reinit\n");
-               goto err_clk_dis;
+               goto err_pm_disable;
        }
 
        /* add i2c adapter to i2c tree */
        ret = i2c_add_adapter(&i2c->adap);
        if (ret) {
                xiic_deinit(i2c);
-               goto err_clk_dis;
+               goto err_pm_disable;
        }
 
        if (pdata) {
@@ -897,10 +892,10 @@ static int xiic_i2c_probe(struct platform_device *pdev)
 
        return 0;
 
-err_clk_dis:
+err_pm_disable:
        pm_runtime_set_suspended(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
-       clk_disable_unprepare(i2c->clk);
+
        return ret;
 }
 
@@ -918,7 +913,6 @@ static int xiic_i2c_remove(struct platform_device *pdev)
 
        xiic_deinit(i2c);
        pm_runtime_put_sync(i2c->dev);
-       clk_disable_unprepare(i2c->clk);
        pm_runtime_disable(&pdev->dev);
        pm_runtime_set_suspended(&pdev->dev);
        pm_runtime_dont_use_autosuspend(&pdev->dev);