[PATCH 01/15] i2c: busses: emev2: Use devm_clk_get_enabled()

Andi Shyti
2023-06-12T01:26:44Z

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>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Magnus Damm <magnus.damm@gmail.com>
---
drivers/i2c/busses/i2c-emev2.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c
index 4ba93cd91c0f0..d080b829f142b 100644
--- a/drivers/i2c/busses/i2c-emev2.c
+++ b/drivers/i2c/busses/i2c-emev2.c
@@ -373,14 +373,10 @@ static int em_i2c_probe(struct platform_device *pdev)

strscpy(priv->adap.name, "EMEV2 I2C", sizeof(priv->adap.name));

- priv->sclk = devm_clk_get(&pdev->dev, "sclk");
+ priv->sclk = devm_clk_get_enabled(&pdev->dev, "sclk");
if (IS_ERR(priv->sclk))
return PTR_ERR(priv->sclk);

- ret = clk_prepare_enable(priv->sclk);
- if (ret)
- return ret;
-
priv->adap.timeout = msecs_to_jiffies(100);
priv->adap.retries = 5;
priv->adap.dev.parent = &pdev->dev;
@@ -397,26 +393,22 @@ static int em_i2c_probe(struct platform_device *pdev)

ret = platform_get_irq(pdev, 0);
if (ret < 0)
- goto err_clk;
+ return ret;
priv->irq = ret;
ret = devm_request_irq(&pdev->dev, priv->irq, em_i2c_irq_handler, 0,
"em_i2c", priv);
if (ret)
- goto err_clk;
+ return ret;

ret = i2c_add_adapter(&priv->adap);

if (ret)
- goto err_clk;
+ return ret;

dev_info(&pdev->dev, "Added i2c controller %d, irq %d\n", priv->adap.nr,
priv->irq);

return 0;
-
-err_clk:
- clk_disable_unprepare(priv->sclk);
- return ret;
}

static void em_i2c_remove(struct platform_device *dev)
@@ -424,7 +416,6 @@ static void em_i2c_remove(struct platform_device *dev)
struct em_i2c_device *priv = platform_get_drvdata(dev);

i2c_del_adapter(&priv->adap);
- clk_disable_unprepare(priv->sclk);
}

static const struct of_device_id em_i2c_ids[] = {
--
2.40.1