]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Input: ad714x - add CONFIG_PM_SLEEP to suspend/resume functions
authorJingoo Han <jg1.han@samsung.com>
Wed, 27 Mar 2013 04:38:52 +0000 (21:38 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 27 Mar 2013 05:09:55 +0000 (22:09 -0700)
Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.

drivers/input/misc/ad714x-i2c.c:17:12: warning: 'ad714x_i2c_suspend' defined but not used [-Wunused-function]
drivers/input/misc/ad714x-i2c.c:22:12: warning: 'ad714x_i2c_resume' defined but not used [-Wunused-function]
drivers/input/misc/ad714x-spi.c:20:12: warning: 'ad714x_spi_suspend' defined but not used [-Wunused-function]
drivers/input/misc/ad714x-spi.c:25:12: warning: 'ad714x_spi_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/misc/ad714x-i2c.c
drivers/input/misc/ad714x-spi.c

index 29d2064c26f23941ed372ddec8ce10b99cbbe371..e0f522516ef54b87f4ba879780a170b3b52edb13 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/pm.h>
 #include "ad714x.h"
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ad714x_i2c_suspend(struct device *dev)
 {
        return ad714x_disable(i2c_get_clientdata(to_i2c_client(dev)));
index bdccca42d1389a533244f22d2f9ab504e573d09c..61891486067cab2a585303398182ffb721688658 100644 (file)
@@ -16,7 +16,7 @@
 #define AD714x_SPI_CMD_PREFIX      0xE000   /* bits 15:11 */
 #define AD714x_SPI_READ            BIT(10)
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ad714x_spi_suspend(struct device *dev)
 {
        return ad714x_disable(spi_get_drvdata(to_spi_device(dev)));