ASoC: tegra30: ahub: Correct suspend-resume callbacks

Tegra30 AHUB driver always syncs hardware state on a runtime PM resume,
hence there is no needed to re-sync the state on system resume. Replace
the suspend-resume callbacks with a generic helpers which ensure that
AHUB is suspended using RPM callbacks across system suspend-resume.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210314154459.15375-17-digetx@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index 409a259..e64b41b 100644 (file)
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -613,36 +613,11 @@ static int tegra30_ahub_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int tegra30_ahub_suspend(struct device *dev)
-{
-       regcache_mark_dirty(ahub->regmap_ahub);
-       regcache_mark_dirty(ahub->regmap_apbif);
-
-       return 0;
-}
-
-static int tegra30_ahub_resume(struct device *dev)
-{
-       int ret;
-
-       ret = pm_runtime_get_sync(dev);
-       if (ret < 0) {
-               pm_runtime_put(dev);
-               return ret;
-       }
-       ret = regcache_sync(ahub->regmap_ahub);
-       ret |= regcache_sync(ahub->regmap_apbif);
-       pm_runtime_put(dev);
-
-       return ret;
-}
-#endif
-
 static const struct dev_pm_ops tegra30_ahub_pm_ops = {
        SET_RUNTIME_PM_OPS(tegra30_ahub_runtime_suspend,
                           tegra30_ahub_runtime_resume, NULL)
-       SET_SYSTEM_SLEEP_PM_OPS(tegra30_ahub_suspend, tegra30_ahub_resume)
+       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+                               pm_runtime_force_resume)
 };
 
 static struct platform_driver tegra30_ahub_driver = {