ASoC: SOF: Do nothing when DSP PM callbacks are not set

[ Upstream commit c26fde3b15ed41f5f452f1da727795f787833287 ]

This provides a better separation between runtime and PM sleep
callbacks.

Only do nothing if given runtime flag is set and calback is not set.

With the current implementation, if PM sleep callback is set but runtime
callback is not set then at runtime resume we reload the firmware even
if we do not support runtime resume callback.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200515135958.17511-2-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index 195af25..128680b 100644 (file)
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -266,7 +266,10 @@ static int sof_resume(struct device *dev, bool runtime_resume)
        int ret;
 
        /* do nothing if dsp resume callbacks are not set */
-       if (!sof_ops(sdev)->resume || !sof_ops(sdev)->runtime_resume)
+       if (!runtime_resume && !sof_ops(sdev)->resume)
+               return 0;
+
+       if (runtime_resume && !sof_ops(sdev)->runtime_resume)
                return 0;
 
        /* DSP was never successfully started, nothing to resume */
@@ -346,7 +349,10 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
        int ret;
 
        /* do nothing if dsp suspend callback is not set */
-       if (!sof_ops(sdev)->suspend)
+       if (!runtime_suspend && !sof_ops(sdev)->suspend)
+               return 0;
+
+       if (runtime_suspend && !sof_ops(sdev)->runtime_suspend)
                return 0;
 
        if (sdev->fw_state != SOF_FW_BOOT_COMPLETE)