i2c: tegra: Runtime PM always available on Tegra
The runtime PM is guaranteed to be always available on Tegra after commit
40b2bb1b13
("ARM: tegra: enforce PM requirement"). Hence let's remove
all the RPM-availability checking and handling from the code.
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Родитель
8ff727316a
Коммит
76bc845a78
|
@ -1775,18 +1775,10 @@ 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");
|
||||
goto put_rpm;
|
||||
}
|
||||
ret = pm_runtime_get_sync(i2c_dev->dev);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "runtime resume failed\n");
|
||||
goto put_rpm;
|
||||
}
|
||||
|
||||
if (i2c_dev->is_multimaster_mode) {
|
||||
|
@ -1845,15 +1837,8 @@ disable_div_clk:
|
|||
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:
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче