soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion
Bard Liao
maintainerPATCH 1/1 soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion
From: Pierre-Louis Bossart <[email protected]>
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.
--- drivers/soundwire/intel.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/soundwire/intel.c +10 -2
@@ -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 = {
Signature · 1 line
2.17.1
Vinod Koul
maintainerQuoted 7 lines · Bard Liao
From: Pierre-Louis Bossart <[email protected]>
When
CONFIG_PM_SLEEPis not defined, GCC throws compilation warnings:
drivers/soundwire/intel.c:1816:12: warning: ‘intel_resume’ defined but not used [-Wunused-function]
1816 | static intintel_resume(struct device *dev)
Quoted 7 lines
| ^~~~~~~~~~~~
drivers/soundwire/intel.c:1697:12: warning: ‘intel_suspend’ defined but not used [-Wunused-function]
1697 | static intintel_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
Quoted 63 lines
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 <[email protected]>Signed-off-by Bard Liao <[email protected]>--- drivers/soundwire/intel.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/soundwire/intel.c +10
-2@@ -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 = {Signature · 1 line
2.17.1
Signature · 1 line
~Vinod
Quoted 9 lines
Quoted 9 lines
When
CONFIG_PM_SLEEPis not defined, GCC throws compilation warnings:
drivers/soundwire/intel.c:1816:12: warning: ‘intel_resume’ defined but not used [-Wunused-function]
1816 | static intintel_resume(struct device *dev)| ^~~~~~~~~~~~
Quoted 8 lines
Quoted 5 lines
drivers/soundwire/intel.c:1697:12: warning: ‘intel_suspend’ defined but not used [-Wunused-function]
1697 | static intintel_suspend(struct device *dev)Fix by adding the missing
CONFIG_PM_SLEEP.Can you rather use
__maybefor for these rather than wrapping in another ifdef, that is the recommended way to do this
No objections, that would work as well.