ASoC: Intel: fix build with runtime PM disabled.

Fix the following errors:

All error/warnings:

>> sound/soc/intel/sst-haswell-pcm.c:1168:13: error: 'hsw_pcm_prepare' undeclared here (not in a function)
     .prepare = hsw_pcm_prepare,
                ^
>> sound/soc/intel/sst-haswell-pcm.c:1169:14: error: 'hsw_pcm_complete' undeclared here (not in a function)
     .complete = hsw_pcm_complete,
                 ^
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index 0ea7c3d..ffd5728 100644 (file)
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -1711,7 +1711,7 @@ void sst_hsw_runtime_module_free(struct sst_module_runtime *runtime)
        sst_module_runtime_free(runtime);
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int sst_hsw_dx_state_dump(struct sst_hsw *hsw)
 {
        struct sst_dsp *sst = hsw->dsp;

diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index 4489a35..cd54dd9 100644 (file)
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
@@ -1058,6 +1058,12 @@ static int hsw_pcm_runtime_resume(struct device *dev)
        return ret;
 }
 
+#else
+#define hsw_pcm_runtime_idle           NULL
+#define hsw_pcm_runtime_suspend                NULL
+#define hsw_pcm_runtime_resume         NULL
+#endif
+
 static void hsw_pcm_complete(struct device *dev)
 {
        struct hsw_priv_data *pdata = dev_get_drvdata(dev);
@@ -1153,14 +1159,6 @@ static int hsw_pcm_prepare(struct device *dev)
        return 0;
 }
 
-#else
-#define hsw_pcm_runtime_idle           NULL
-#define hsw_pcm_runtime_suspend                NULL
-#define hsw_pcm_runtime_resume         NULL
-#define hsw_pcm_runtime_complete       NULL
-#define hsw_pcm_runtime_prepare                NULL
-#endif
-
 static const struct dev_pm_ops hsw_pcm_pm = {
        .runtime_idle = hsw_pcm_runtime_idle,
        .runtime_suspend = hsw_pcm_runtime_suspend,