Commit 7da13023 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wolfram Sang
Browse files

i2c: imx: Simplify using devm_clk_get_enabled() 



devm_clk_get_enabled() returns the clk already (prepared and) enabled
and the automatically called cleanup cares for disabling (and
unpreparing). So simplify .probe() and .remove() accordingly.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 7a287433

drivers/i2c/busses/i2c-imx.c

+1 −11
Original line number Diff line number Diff line
@@ -1482,17 +1482,11 @@ static int i2c_imx_probe(struct platform_device *pdev) 
	ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev));



	/* Get I2C clock */

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

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

	if (IS_ERR(i2c_imx->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(i2c_imx->clk),

				     "can't get I2C clock\n");



	ret = clk_prepare_enable(i2c_imx->clk);

	if (ret) {

		dev_err(&pdev->dev, "can't enable I2C clock, ret=%d\n", ret);

		return ret;

	}



	/* Init queue */

	init_waitqueue_head(&i2c_imx->queue);
@@ -1564,7 +1558,6 @@ static int i2c_imx_probe(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

	pm_runtime_dont_use_autosuspend(&pdev->dev);

	clk_disable_unprepare(i2c_imx->clk);

	return ret;

}
@@ -1590,7 +1583,6 @@ static int i2c_imx_remove(struct platform_device *pdev) 
		imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IFDR);

		imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2CR);

		imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR);

		clk_disable(i2c_imx->clk);

	}



	clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
@@ -1598,8 +1590,6 @@ static int i2c_imx_remove(struct platform_device *pdev) 
	if (irq >= 0)

		free_irq(irq, i2c_imx);



	clk_unprepare(i2c_imx->clk);



	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(&pdev->dev);