summaryrefslogtreecommitdiff
path: root/sound/soc/intel/sst-haswell-pcm.c
diff options
context:
space:
mode:
authorLiam Girdwood <liam.r.girdwood@linux.intel.com>2014-10-30 17:58:19 +0300
committerMark Brown <broonie@kernel.org>2014-10-30 18:56:01 +0300
commit35e03a884c41b8fecf77e20de89759deb7c9078a (patch)
tree735055cd427f805b3d54f25f96f29e5c515fd1c2 /sound/soc/intel/sst-haswell-pcm.c
parentb891f62fcd28a46ab0818cd9acbb5bbb20542ab6 (diff)
downloadlinux-35e03a884c41b8fecf77e20de89759deb7c9078a.tar.xz
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>
Diffstat (limited to 'sound/soc/intel/sst-haswell-pcm.c')
-rw-r--r--sound/soc/intel/sst-haswell-pcm.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index 4489a35e691e..cd54dd9967af 100644
--- 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,