OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

i2c: uniphier: Use devm_clk_get_enabled() 

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>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Andi Shyti 2023-06-12 00:57:02 +02:00 committed by Wolfram Sang
parent ff896ef401
commit 8a86133e06
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/i2c/busses/i2c-uniphier.c
View File

@ -335,21 +335,16 @@ static int uniphier_i2c_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
priv->clk = devm_clk_get(dev, NULL); priv->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(priv->clk)) { if (IS_ERR(priv->clk)) {
dev_err(dev, "failed to get clock\n"); dev_err(dev, "failed to enable clock\n");
return PTR_ERR(priv->clk); return PTR_ERR(priv->clk);
} }
ret = clk_prepare_enable(priv->clk);
if (ret)
return ret;
clk_rate = clk_get_rate(priv->clk); clk_rate = clk_get_rate(priv->clk);
if (!clk_rate) { if (!clk_rate) {
dev_err(dev, "input clock rate should not be zero\n"); dev_err(dev, "input clock rate should not be zero\n");
ret = -EINVAL; return -EINVAL;
goto disable_clk;
} }
priv->clk_cycle = clk_rate / bus_speed; priv->clk_cycle = clk_rate / bus_speed;
@ -369,15 +364,10 @@ static int uniphier_i2c_probe(struct platform_device *pdev)
priv); priv);
if (ret) { if (ret) {
dev_err(dev, "failed to request irq %d\n", irq); dev_err(dev, "failed to request irq %d\n", irq);
goto disable_clk; return ret;
} }
ret = i2c_add_adapter(&priv->adap); return i2c_add_adapter(&priv->adap);
disable_clk:
if (ret)
clk_disable_unprepare(priv->clk);
return ret;
} }
static void uniphier_i2c_remove(struct platform_device *pdev) static void uniphier_i2c_remove(struct platform_device *pdev)
@ -385,7 +375,6 @@ static void uniphier_i2c_remove(struct platform_device *pdev)
struct uniphier_i2c_priv *priv = platform_get_drvdata(pdev); struct uniphier_i2c_priv *priv = platform_get_drvdata(pdev);
i2c_del_adapter(&priv->adap); i2c_del_adapter(&priv->adap);
clk_disable_unprepare(priv->clk);
} }
static int __maybe_unused uniphier_i2c_suspend(struct device *dev) static int __maybe_unused uniphier_i2c_suspend(struct device *dev)