ASoC: intel: Revert "ASoC: Intel: fix broadwell module removing failed issue"

This reverts commit adcff2d924c763d548d82011fb6df59ebe034c35.

We shouldn't leave the device as suspended state after module freed,
it is not good to do runtime suspend at driver free, here revert
this fixing, and replace it with the procedure:
suspends firmware ==> frees runtime modules ==> unloads firmware.

Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c
index bd96629e094143357f47e5edbab4ffe77b2d3c29..23ae0400d6db99668b3d2b48b47eb003d2fc2e46 100644 (file)
--- a/sound/soc/intel/haswell/sst-haswell-pcm.c
+++ b/sound/soc/intel/haswell/sst-haswell-pcm.c
@@ -1118,10 +1118,8 @@ static int hsw_pcm_remove(struct snd_soc_platform *platform)
                snd_soc_platform_get_drvdata(platform);
        int i;
 
-       /* execute a suspend call to unload all FW resources */
-       if (!pm_runtime_status_suspended(platform->dev))
-               pm_runtime_put_sync_suspend(platform->dev);
        pm_runtime_disable(platform->dev);
+       hsw_pcm_free_modules(priv_data);
 
        for (i = 0; i < ARRAY_SIZE(hsw_dais); i++) {
                if (hsw_dais[i].playback.channels_min)