Commit 2158566b authored by Andi Shyti's avatar Andi Shyti Committed by Wolfram Sang
Browse files

i2c: mt7621: 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: default avatarAndi Shyti <andi.shyti@kernel.org>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 8390dc74

drivers/i2c/busses/i2c-mt7621.c

+4 −16
Original line number Diff line number Diff line
@@ -282,16 +282,11 @@ static int mtk_i2c_probe(struct platform_device *pdev) 
	if (IS_ERR(i2c->base))

		return PTR_ERR(i2c->base);



	i2c->clk = devm_clk_get(&pdev->dev, NULL);

	i2c->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(i2c->clk)) {

		dev_err(&pdev->dev, "no clock defined\n");

		dev_err(&pdev->dev, "Failed to enable clock\n");

		return PTR_ERR(i2c->clk);

	}

	ret = clk_prepare_enable(i2c->clk);

	if (ret) {

		dev_err(&pdev->dev, "Unable to enable clock\n");

		return ret;

	}



	i2c->dev = &pdev->dev;
@@ -301,8 +296,7 @@ static int mtk_i2c_probe(struct platform_device *pdev) 


	if (i2c->bus_freq == 0) {

		dev_warn(i2c->dev, "clock-frequency 0 not supported\n");

		ret = -EINVAL;

		goto err_disable_clk;

		return -EINVAL;

	}



	adap = &i2c->adap;
@@ -320,23 +314,17 @@ static int mtk_i2c_probe(struct platform_device *pdev) 


	ret = i2c_add_adapter(adap);

	if (ret < 0)

		goto err_disable_clk;

		return ret;



	dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);



	return 0;



err_disable_clk:

	clk_disable_unprepare(i2c->clk);



	return ret;

}



static void mtk_i2c_remove(struct platform_device *pdev)

{

	struct mtk_i2c *i2c = platform_get_drvdata(pdev);



	clk_disable_unprepare(i2c->clk);

	i2c_del_adapter(&i2c->adap);

}