Commit 3d36dd11 authored by Michal Simek's avatar Michal Simek Committed by Andi Shyti
Browse files

i2c: cadence: Simplify using devm_clk_get_enabled() 



Clock handling can be very simplified with using devm_clk_get_enabled() as
was done by commit 8d2aaf43 ("gpio: zynq: Simplify using
devm_clk_get_enabled()").
And also fix issue in connection to incorrect sequence when err_clk_dis
label is called.
When reset_control_deassert() fails it jumps to err_clk_dis label which
disables clock and also disable pm_runtime setup but nothing has been setup
at this time of failure because initialization is done below
reset_control_deassert() call.

Signed-off-by: default avatarMichal Simek <michal.simek@amd.com>
Signed-off-by: default avatarManikanta Guntupalli <manikanta.guntupalli@amd.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20250206115708.1085523-2-manikanta.guntupalli@amd.com
parent ff885b6f

drivers/i2c/busses/i2c-cadence.c

+4 −13
Original line number Diff line number Diff line
@@ -1541,7 +1541,7 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
	snprintf(id->adap.name, sizeof(id->adap.name),

		 "Cadence I2C at %08lx", (unsigned long)r_mem->start);



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

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

	if (IS_ERR(id->clk))

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

				     "input clock not found.\n");
@@ -1551,16 +1551,10 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
		return dev_err_probe(&pdev->dev, PTR_ERR(id->reset),

				     "Failed to request reset.\n");



	ret = clk_prepare_enable(id->clk);

	if (ret)

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



	ret = reset_control_deassert(id->reset);

	if (ret) {

		dev_err_probe(&pdev->dev, ret,

	if (ret)

		return dev_err_probe(&pdev->dev, ret,

				     "Failed to de-assert reset.\n");

		goto err_clk_dis;

	}



	pm_runtime_set_autosuspend_delay(id->dev, CNDS_I2C_PM_TIMEOUT);

	pm_runtime_use_autosuspend(id->dev);
@@ -1616,8 +1610,6 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
err_clk_notifier_unregister:

	clk_notifier_unregister(id->clk, &id->clk_rate_change_nb);

	reset_control_assert(id->reset);

err_clk_dis:

	clk_disable_unprepare(id->clk);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

	return ret;
@@ -1642,7 +1634,6 @@ static void cdns_i2c_remove(struct platform_device *pdev) 
	i2c_del_adapter(&id->adap);

	clk_notifier_unregister(id->clk, &id->clk_rate_change_nb);

	reset_control_assert(id->reset);

	clk_disable_unprepare(id->clk);

}



static struct platform_driver cdns_i2c_drv = {