Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2cb55a2f47a3c695a0105b7fc04a3b70c3bc4e4f

Authored by Yuanhan Liu
Committed by Greg Kroah-Hartman
1 parent 1392550240
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP 

This will fix warnings like following when CONFIG_PM_SLEEP is not set:

        warning: 'xxx_suspend' defined but not used [-Wunused-function]
        warning: 'xxx_resume' defined but not used [-Wunused-function]

Because
	SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn)

Only references the callbacks on CONFIG_PM_SLEEP (instead of CONFIG_PM).

Cc: Mattia Dongili <malattia@linux.it>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/char/sonypi.c
Diff comments   View file @ 2cb55a2
... ... @@ -1456,7 +1456,7 @@
1456 1456 return 0;
1457 1457 }
1458 1458  
1459   -#ifdef CONFIG_PM
  1459 +#ifdef CONFIG_PM_SLEEP
1460 1460 static int old_camera_power;
1461 1461  
1462 1462 static int sonypi_suspend(struct device *dev)