* [PATCH] soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion
@ 2020-08-20 14:04 Bard Liao
2020-08-21 5:01 ` Vinod Koul
0 siblings, 1 reply; 3+ messages in thread
From: Bard Liao @ 2020-08-20 14:04 UTC (permalink / raw)
To: alsa-devel, vkoul
Cc: vinod.koul, linux-kernel, tiwai, broonie, gregkh, jank,
srinivas.kandagatla, rander.wang, ranjani.sridharan, hui.wang,
pierre-louis.bossart, sanyog.r.kale, mengdong.lin, bard.liao
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
When CONFIG_PM_SLEEP is not defined, GCC throws compilation warnings:
drivers/soundwire/intel.c:1816:12: warning: ‘intel_resume’ defined but
not used [-Wunused-function]
1816 | static int intel_resume(struct device *dev)
| ^~~~~~~~~~~~
drivers/soundwire/intel.c:1697:12: warning: ‘intel_suspend’ defined
but not used [-Wunused-function]
1697 | static int intel_suspend(struct device *dev)
Fix by adding the missing CONFIG_PM_SLEEP.
Note that we could move code around and use only 2 ifdefs, but this
will generate conflicts so let's do this when all the pm handling is
merged.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
drivers/soundwire/intel.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index dbcbe2708563..a2f0026cb2c1 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -1525,7 +1525,7 @@ int intel_master_process_wakeen_event(struct platform_device *pdev)
* PM calls
*/
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int intel_suspend(struct device *dev)
{
@@ -1562,6 +1562,9 @@ static int intel_suspend(struct device *dev)
return 0;
}
+#endif
+
+#ifdef CONFIG_PM
static int intel_suspend_runtime(struct device *dev)
{
@@ -1624,6 +1627,9 @@ static int intel_suspend_runtime(struct device *dev)
return ret;
}
+#endif
+
+#ifdef CONFIG_PM_SLEEP
static int intel_resume(struct device *dev)
{
@@ -1691,6 +1697,9 @@ static int intel_resume(struct device *dev)
return ret;
}
+#endif
+
+#ifdef CONFIG_PM
static int intel_resume_runtime(struct device *dev)
{
@@ -1797,7 +1806,6 @@ static int intel_resume_runtime(struct device *dev)
return ret;
}
-
#endif
static const struct dev_pm_ops intel_pm = {
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion
2020-08-20 14:04 [PATCH] soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion Bard Liao
@ 2020-08-21 5:01 ` Vinod Koul
2020-08-21 15:23 ` Pierre-Louis Bossart
0 siblings, 1 reply; 3+ messages in thread
From: Vinod Koul @ 2020-08-21 5:01 UTC (permalink / raw)
To: Bard Liao
Cc: alsa-devel, linux-kernel, tiwai, broonie, gregkh, jank,
srinivas.kandagatla, rander.wang, ranjani.sridharan, hui.wang,
pierre-louis.bossart, sanyog.r.kale, mengdong.lin, bard.liao
On 20-08-20, 22:04, Bard Liao wrote:
> From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
>
> When CONFIG_PM_SLEEP is not defined, GCC throws compilation warnings:
>
> drivers/soundwire/intel.c:1816:12: warning: ‘intel_resume’ defined but
> not used [-Wunused-function]
> 1816 | static int intel_resume(struct device *dev)
> | ^~~~~~~~~~~~
>
> drivers/soundwire/intel.c:1697:12: warning: ‘intel_suspend’ defined
> but not used [-Wunused-function]
> 1697 | static int intel_suspend(struct device *dev)
>
> Fix by adding the missing CONFIG_PM_SLEEP.
Can you rather use __maybe for for these rather than wrapping in another
ifdef, that is the recommended way to do this
Thanks
> Note that we could move code around and use only 2 ifdefs, but this
> will generate conflicts so let's do this when all the pm handling is
> merged.
>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> ---
> drivers/soundwire/intel.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index dbcbe2708563..a2f0026cb2c1 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -1525,7 +1525,7 @@ int intel_master_process_wakeen_event(struct platform_device *pdev)
> * PM calls
> */
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
>
> static int intel_suspend(struct device *dev)
> {
> @@ -1562,6 +1562,9 @@ static int intel_suspend(struct device *dev)
>
> return 0;
> }
> +#endif
> +
> +#ifdef CONFIG_PM
>
> static int intel_suspend_runtime(struct device *dev)
> {
> @@ -1624,6 +1627,9 @@ static int intel_suspend_runtime(struct device *dev)
>
> return ret;
> }
> +#endif
> +
> +#ifdef CONFIG_PM_SLEEP
>
> static int intel_resume(struct device *dev)
> {
> @@ -1691,6 +1697,9 @@ static int intel_resume(struct device *dev)
>
> return ret;
> }
> +#endif
> +
> +#ifdef CONFIG_PM
>
> static int intel_resume_runtime(struct device *dev)
> {
> @@ -1797,7 +1806,6 @@ static int intel_resume_runtime(struct device *dev)
>
> return ret;
> }
> -
> #endif
>
> static const struct dev_pm_ops intel_pm = {
> --
> 2.17.1
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion
2020-08-21 5:01 ` Vinod Koul
@ 2020-08-21 15:23 ` Pierre-Louis Bossart
0 siblings, 0 replies; 3+ messages in thread
From: Pierre-Louis Bossart @ 2020-08-21 15:23 UTC (permalink / raw)
To: Vinod Koul, Bard Liao
Cc: alsa-devel, tiwai, gregkh, linux-kernel, ranjani.sridharan,
hui.wang, broonie, srinivas.kandagatla, jank, mengdong.lin,
sanyog.r.kale, rander.wang, bard.liao
>> When CONFIG_PM_SLEEP is not defined, GCC throws compilation warnings:
>>
>> drivers/soundwire/intel.c:1816:12: warning: ‘intel_resume’ defined but
>> not used [-Wunused-function]
>> 1816 | static int intel_resume(struct device *dev)
>> | ^~~~~~~~~~~~
>>
>> drivers/soundwire/intel.c:1697:12: warning: ‘intel_suspend’ defined
>> but not used [-Wunused-function]
>> 1697 | static int intel_suspend(struct device *dev)
>>
>> Fix by adding the missing CONFIG_PM_SLEEP.
>
> Can you rather use __maybe for for these rather than wrapping in another
> ifdef, that is the recommended way to do this
No objections, that would work as well.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-21 15:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-20 14:04 [PATCH] soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion Bard Liao
2020-08-21 5:01 ` Vinod Koul
2020-08-21 15:23 ` Pierre-Louis Bossart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox