From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yuanhan Liu Subject: [PATCH 4/5] sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP Date: Tue, 16 Oct 2012 22:59:04 +0800 Message-ID: <1350399545-11179-4-git-send-email-yuanhan.liu@linux.intel.com> References: <1350399545-11179-1-git-send-email-yuanhan.liu@linux.intel.com> Return-path: In-Reply-To: <1350399545-11179-1-git-send-email-yuanhan.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Yuanhan Liu , Mattia Dongili , Arnd Bergmann , Greg Kroah-Hartman , platform-driver-x86@vger.kernel.org, Fengguang Wu List-Id: platform-driver-x86.vger.kernel.org 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 Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Yuanhan Liu Signed-off-by: Fengguang Wu --- drivers/char/sonypi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 320debb..9b4f011 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -1456,7 +1456,7 @@ static int __devexit sonypi_remove(struct platform_device *dev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int old_camera_power; static int sonypi_suspend(struct device *dev) -- 1.7.7.6