Commit 76bc845a authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Wolfram Sang
Browse files

i2c: tegra: Runtime PM always available on Tegra 



The runtime PM is guaranteed to be always available on Tegra after commit
40b2bb1b ("ARM: tegra: enforce PM requirement"). Hence let's remove
all the RPM-availability checking and handling from the code.

Reviewed-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 8ff72731

drivers/i2c/busses/i2c-tegra.c

+6 −23
Original line number Diff line number Diff line
@@ -1775,19 +1775,11 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
	if (!i2c_dev->is_vi)

		pm_runtime_irq_safe(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {

		ret = tegra_i2c_runtime_resume(&pdev->dev);

		if (ret < 0) {

			dev_err(&pdev->dev, "runtime resume failed\n");

			goto unprepare_div_clk;

		}

	} else {

	ret = pm_runtime_get_sync(i2c_dev->dev);

	if (ret < 0) {

			dev_err(&pdev->dev, "runtime resume failed\n");

		dev_err(dev, "runtime resume failed\n");

		goto put_rpm;

	}

	}



	if (i2c_dev->is_multimaster_mode) {

		ret = clk_enable(i2c_dev->div_clk);
@@ -1845,15 +1837,8 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
		clk_disable(i2c_dev->div_clk);



put_rpm:

	if (pm_runtime_enabled(&pdev->dev))

	pm_runtime_put_sync(&pdev->dev);

	else

		tegra_i2c_runtime_suspend(&pdev->dev);



	if (pm_runtime_enabled(&pdev->dev))

	pm_runtime_disable(&pdev->dev);



unprepare_div_clk:

	clk_unprepare(i2c_dev->div_clk);



unprepare_slow_clk:
@@ -1875,8 +1860,6 @@ static int tegra_i2c_remove(struct platform_device *pdev) 
		clk_disable(i2c_dev->div_clk);



	pm_runtime_disable(&pdev->dev);

	if (!pm_runtime_status_suspended(&pdev->dev))

		tegra_i2c_runtime_suspend(&pdev->dev);



	clk_unprepare(i2c_dev->div_clk);

	clk_unprepare(i2c_dev->slow_clk);