On Wed, Mar 28, 2018 at 4:31 PM, Lukas Wunner lukas@wunner.de wrote:
On Wed, Mar 28, 2018 at 04:19:29PM +0200, Arnd Bergmann wrote:
Two callsites of azx_suspend/azx_resume were removed, leaving these functions only called from the optional SET_SYSTEM_SLEEP_PM_OPS() and causing a warning without CONFIG_PM_SLEEP:
sound/pci/hda/hda_intel.c:1029:12: error: 'azx_resume' defined but not used [-Werror=unused-function] static int azx_resume(struct device *dev) ^~~~~~~~~~ sound/pci/hda/hda_intel.c:994:12: error: 'azx_suspend' defined but not used [-Werror=unused-function] static int azx_suspend(struct device *dev) ^~~~~~~~~~~
Keeping track of the correct #ifdef checks is hard, so this removes all the #ifdefs for power management in this file and instead uses __maybe_unused annotations that let the compiler do the job right by itself.
Ugh, this isn't as hard as it may seem, just replace
#if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO)with
#if defined(CONFIG_PM_SLEEP)That way it's just a simple one line change which is less intrusive.
Care to respin like this?
I won't be able to test that properly before the merge window. If you are sure that works, maybe you can send that patch and just mark it as 'Reported-by: Arnd Bergmann arnd@arndb.de'?
I've mostly stopped trying to figure out what the correct set of #ifdef for power management functions is, since I get those wrong as much as everyone else. ;-). The patch I sent has been through a few days of randconfig testing.
Arnd