Commit 390d6458 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Rob Clark
Browse files

drm/msm/gpu: Avoid -Wunused-function with !CONFIG_PM_SLEEP 



When building with CONFIG_PM=y and CONFIG_PM_SLEEP=n (such as ARCH=riscv
allmodconfig), the following warnings/errors occur:

  drivers/gpu/drm/msm/adreno/adreno_device.c:679:12: error: 'adreno_system_resume' defined but not used [-Werror=unused-function]
    679 | static int adreno_system_resume(struct device *dev)
        |            ^~~~~~~~~~~~~~~~~~~~
  drivers/gpu/drm/msm/adreno/adreno_device.c:655:12: error: 'adreno_system_suspend' defined but not used [-Werror=unused-function]
    655 | static int adreno_system_suspend(struct device *dev)
        |            ^~~~~~~~~~~~~~~~~~~~~
  cc1: all warnings being treated as errors

These functions are only used in SET_SYSTEM_SLEEP_PM_OPS(), which
evaluates to empty when CONFIG_PM_SLEEP is not set, making these
functions unused.

To resolve this, use the SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS()
macros, which were introduced in commit 1a3c7bb0 ("PM: core: Add new
*_PM_OPS macros, deprecate old ones"). They are designed to avoid these
compiler warnings while still guarding their use on
CONFIG_PM{,_SLEEP}=y.

Fixes: 7e4167c9 ("drm/msm/gpu: Park scheduler threads for system suspend")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20220411181249.2758344-1-nathan@kernel.org


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 8b2c181e

drivers/gpu/drm/msm/adreno/adreno_device.c

+2 −5
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ static const struct of_device_id dt_match[] = { 
	{}

};



#ifdef CONFIG_PM

static int adreno_runtime_resume(struct device *dev)

{

	struct msm_gpu *gpu = dev_to_gpu(dev);
@@ -682,11 +681,9 @@ static int adreno_system_resume(struct device *dev) 
	return pm_runtime_force_resume(dev);

}



#endif



static const struct dev_pm_ops adreno_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(adreno_system_suspend, adreno_system_resume)

	SET_RUNTIME_PM_OPS(adreno_runtime_suspend, adreno_runtime_resume, NULL)

	SYSTEM_SLEEP_PM_OPS(adreno_system_suspend, adreno_system_resume)

	RUNTIME_PM_OPS(adreno_runtime_suspend, adreno_runtime_resume, NULL)

};



static struct platform_driver adreno_driver = {