| Message ID | 20201203230502.1480063-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 17e0da0b8979a53977f684813f5c9db817d170e2 |
| Headers | show |
| Series | soundwire: intel: fix another unused-function warning | expand |
On 12/3/20 5:04 PM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Without CONFIG_PM, there is another warning about an unused function: > > drivers/soundwire/intel.c:530:12: error: 'intel_link_power_down' defined but not used [-Werror=unused-function] > > After a previous fix, the driver already uses both an #ifdef and > a __maybe_unused annotation but still gets it wrong. Remove the > ifdef and instead use __maybe_unused consistently to avoid the > problem for good. > > Fixes: f046b2334083 ("soundwire: intel: fix intel_suspend/resume defined but not used warning") > Fixes: ebf878eddbb4 ("soundwire: intel: add pm_runtime support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for the patch Arnd, indeed that's a miss. Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/soundwire/intel.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c > index 6a1e862b16c3..66adb258a425 100644 > --- a/drivers/soundwire/intel.c > +++ b/drivers/soundwire/intel.c > @@ -1585,8 +1585,6 @@ int intel_master_process_wakeen_event(struct platform_device *pdev) > * PM calls > */ > > -#ifdef CONFIG_PM > - > static int __maybe_unused intel_suspend(struct device *dev) > { > struct sdw_cdns *cdns = dev_get_drvdata(dev); > @@ -1641,7 +1639,7 @@ static int __maybe_unused intel_suspend(struct device *dev) > return 0; > } > > -static int intel_suspend_runtime(struct device *dev) > +static int __maybe_unused intel_suspend_runtime(struct device *dev) > { > struct sdw_cdns *cdns = dev_get_drvdata(dev); > struct sdw_intel *sdw = cdns_to_intel(cdns); > @@ -1796,7 +1794,7 @@ static int __maybe_unused intel_resume(struct device *dev) > return ret; > } > > -static int intel_resume_runtime(struct device *dev) > +static int __maybe_unused intel_resume_runtime(struct device *dev) > { > struct sdw_cdns *cdns = dev_get_drvdata(dev); > struct sdw_intel *sdw = cdns_to_intel(cdns); > @@ -1969,8 +1967,6 @@ static int intel_resume_runtime(struct device *dev) > return ret; > } > > -#endif > - > static const struct dev_pm_ops intel_pm = { > SET_SYSTEM_SLEEP_PM_OPS(intel_suspend, intel_resume) > SET_RUNTIME_PM_OPS(intel_suspend_runtime, intel_resume_runtime, NULL) >
On 04-12-20, 00:04, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Without CONFIG_PM, there is another warning about an unused function: > > drivers/soundwire/intel.c:530:12: error: 'intel_link_power_down' defined but not used [-Werror=unused-function] Applied, thanks
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 6a1e862b16c3..66adb258a425 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1585,8 +1585,6 @@ int intel_master_process_wakeen_event(struct platform_device *pdev) * PM calls */ -#ifdef CONFIG_PM - static int __maybe_unused intel_suspend(struct device *dev) { struct sdw_cdns *cdns = dev_get_drvdata(dev); @@ -1641,7 +1639,7 @@ static int __maybe_unused intel_suspend(struct device *dev) return 0; } -static int intel_suspend_runtime(struct device *dev) +static int __maybe_unused intel_suspend_runtime(struct device *dev) { struct sdw_cdns *cdns = dev_get_drvdata(dev); struct sdw_intel *sdw = cdns_to_intel(cdns); @@ -1796,7 +1794,7 @@ static int __maybe_unused intel_resume(struct device *dev) return ret; } -static int intel_resume_runtime(struct device *dev) +static int __maybe_unused intel_resume_runtime(struct device *dev) { struct sdw_cdns *cdns = dev_get_drvdata(dev); struct sdw_intel *sdw = cdns_to_intel(cdns); @@ -1969,8 +1967,6 @@ static int intel_resume_runtime(struct device *dev) return ret; } -#endif - static const struct dev_pm_ops intel_pm = { SET_SYSTEM_SLEEP_PM_OPS(intel_suspend, intel_resume) SET_RUNTIME_PM_OPS(intel_suspend_runtime, intel_resume_runtime, NULL)