diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-03-26 16:05:36 +0900 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 08:50:51 -0700 | 
| commit | 0ca19d6f5feb57dcd5645c0761282e1b9fc3afcb (patch) | |
| tree | 0d8af16b67d5f6506030d34455d16d0e6f6ca9f7 | |
| parent | 688ef20250c472e183f34709c4be12af6341f927 (diff) | |
| download | olio-linux-3.10-0ca19d6f5feb57dcd5645c0761282e1b9fc3afcb.tar.xz olio-linux-3.10-0ca19d6f5feb57dcd5645c0761282e1b9fc3afcb.zip  | |
misc: bh1770glc: add CONFIG_PM_SLEEP to suspend/resume functions
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 SET_SYSTEM_SLEEP_PM_OPS are only used
when the CONFIG_PM_SLEEP is enabled.
drivers/misc/bh1770glc.c:1314:12: warning: 'bh1770_suspend' defined but not used [-Wunused-function]
drivers/misc/bh1770glc.c:1324:12: warning: 'bh1770_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/bh1770glc.c | 7 | 
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/misc/bh1770glc.c b/drivers/misc/bh1770glc.c index 2ed8fc3be7e..f4975f7d0d5 100644 --- a/drivers/misc/bh1770glc.c +++ b/drivers/misc/bh1770glc.c @@ -1310,7 +1310,7 @@ static int bh1770_remove(struct i2c_client *client)  	return 0;  } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP  static int bh1770_suspend(struct device *dev)  {  	struct i2c_client *client = container_of(dev, struct i2c_client, dev); @@ -1346,11 +1346,6 @@ static int bh1770_resume(struct device *dev)  	}  	return ret;  } - -#else -#define bh1770_suspend	NULL -#define bh1770_shutdown NULL -#define bh1770_resume	NULL  #endif  #ifdef CONFIG_PM_RUNTIME  |