[alsa-devel] [PATCH] ASoC: Intel: fix a compiling issue
Fix the compiling issue that we don't have snd_soc_suspend/resume() when CONFIG_PM_SLEEP is not defined.
Signed-off-by: Jie Yang yang.jie@intel.com --- sound/soc/intel/haswell/sst-haswell-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c index 23ae040..f84eb14 100644 --- a/sound/soc/intel/haswell/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -1313,8 +1313,9 @@ static void hsw_pcm_complete(struct device *dev) dev_err(dev, "failed to restore context for PCM %d\n", i); }
+#ifdef CONFIG_PM_SLEEP snd_soc_resume(pdata->soc_card->dev); - +#endif err = sst_hsw_dsp_runtime_resume(hsw); if (err < 0) return; @@ -1367,7 +1368,9 @@ static int hsw_pcm_prepare(struct device *dev) sst_hsw_dsp_runtime_sleep(hsw); }
+#ifdef CONFIG_PM_SLEEP snd_soc_suspend(pdata->soc_card->dev); +#endif snd_soc_poweroff(pdata->soc_card->dev);
pdata->pm_state = HSW_PM_STATE_D3;
Hi
On Apr 13, 2015 4:44 AM, "Jie Yang" yang.jie@intel.com wrote:
Fix the compiling issue that we don't have snd_soc_suspend/resume() when CONFIG_PM_SLEEP is not defined.
Signed-off-by: Jie Yang yang.jie@intel.com
sound/soc/intel/haswell/sst-haswell-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c
b/sound/soc/intel/haswell/sst-haswell-pcm.c
index 23ae040..f84eb14 100644 --- a/sound/soc/intel/haswell/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -1313,8 +1313,9 @@ static void hsw_pcm_complete(struct device *dev) dev_err(dev, "failed to restore context for PCM
%d\n", i);
}+#ifdef CONFIG_PM_SLEEP snd_soc_resume(pdata->soc_card->dev);
+#endif
I think it's better to include an empy version for this configuration
Michael
err = sst_hsw_dsp_runtime_resume(hsw); if (err < 0) return;@@ -1367,7 +1368,9 @@ static int hsw_pcm_prepare(struct device *dev) sst_hsw_dsp_runtime_sleep(hsw); }
+#ifdef CONFIG_PM_SLEEP snd_soc_suspend(pdata->soc_card->dev); +#endif snd_soc_poweroff(pdata->soc_card->dev);
pdata->pm_state = HSW_PM_STATE_D3;-- 1.9.1
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On 2015年04月13日 12:50, Michael Trimarchi wrote:
Hi
On Apr 13, 2015 4:44 AM, "Jie Yang" yang.jie@intel.com wrote:
Fix the compiling issue that we don't have snd_soc_suspend/resume() when CONFIG_PM_SLEEP is not defined.
Signed-off-by: Jie Yang yang.jie@intel.com
sound/soc/intel/haswell/sst-haswell-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c
b/sound/soc/intel/haswell/sst-haswell-pcm.c
index 23ae040..f84eb14 100644 --- a/sound/soc/intel/haswell/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -1313,8 +1313,9 @@ static void hsw_pcm_complete(struct device *dev) dev_err(dev, "failed to restore context for PCM
%d\n", i);
}+#ifdef CONFIG_PM_SLEEP snd_soc_resume(pdata->soc_card->dev);
+#endif
I think it's better to include an empy version for this configuration
Michael
do you mean that adding line such like:
#define snd_soc_resume NULL
we have that in soc-core.c, but only the non-null version is exported.
~Keyon
err = sst_hsw_dsp_runtime_resume(hsw); if (err < 0) return;@@ -1367,7 +1368,9 @@ static int hsw_pcm_prepare(struct device *dev) sst_hsw_dsp_runtime_sleep(hsw); }
+#ifdef CONFIG_PM_SLEEP snd_soc_suspend(pdata->soc_card->dev); +#endif snd_soc_poweroff(pdata->soc_card->dev);
pdata->pm_state = HSW_PM_STATE_D3;-- 1.9.1
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On Mon, Apr 13, 2015 at 10:47:30AM +0800, Jie Yang wrote:
Fix the compiling issue that we don't have snd_soc_suspend/resume() when CONFIG_PM_SLEEP is not defined.
+#ifdef CONFIG_PM_SLEEP snd_soc_resume(pdata->soc_card->dev);
+#endif
Rather than have the ifdefs in the users it seems like it'd be better to fix this by providing static inline stub functions in the headers. That way nothing else will run into the same trouble.
Hi
On Apr 18, 2015 8:11 PM, "Mark Brown" broonie@kernel.org wrote:
On Mon, Apr 13, 2015 at 10:47:30AM +0800, Jie Yang wrote:
Fix the compiling issue that we don't have snd_soc_suspend/resume() when CONFIG_PM_SLEEP is not defined.
+#ifdef CONFIG_PM_SLEEP snd_soc_resume(pdata->soc_card->dev);
+#endif
Rather than have the ifdefs in the users it seems like it'd be better to fix this by providing static inline stub functions in the headers. That way nothing else will run into the same trouble.
This was my "English" suggestion
Thanks
Michael
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On Sat, Apr 18, 2015 at 02:19:37PM +0200, Michael Trimarchi wrote:
On Apr 18, 2015 8:11 PM, "Mark Brown" broonie@kernel.org wrote:
Rather than have the ifdefs in the users it seems like it'd be better to fix this by providing static inline stub functions in the headers. That way nothing else will run into the same trouble.
This was my "English" suggestion
Yeah, I hadn't seen your mail when I wrote the above.
-----Original Message----- From: Mark Brown [mailto:broonie@kernel.org] Sent: Sunday, April 19, 2015 1:03 AM To: Michael Trimarchi Cc: alsa-devel@alsa-project.org; Jie, Yang; Girdwood, Liam R Subject: Re: [alsa-devel] [PATCH] ASoC: Intel: fix a compiling issue
On Sat, Apr 18, 2015 at 02:19:37PM +0200, Michael Trimarchi wrote:
On Apr 18, 2015 8:11 PM, "Mark Brown" broonie@kernel.org wrote:
Rather than have the ifdefs in the users it seems like it'd be better to fix this by providing static inline stub functions in the headers. That way nothing else will run into the same trouble.
This was my "English" suggestion
Yeah, I hadn't seen your mail when I wrote the above.
Thank you, Mark and Michael. Will follow it and send another patch soon.
~Keyon
participants (5)
-
Jie Yang -
Jie, Yang
-
Keyon -
Mark Brown -
Michael Trimarchi