aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-03-26 03:05:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-29 11:50:51 -0400
commit688ef20250c472e183f34709c4be12af6341f927 (patch)
tree41bc6679e7624363d33e1f0f5193b0601cb0b289 /drivers/misc
parentaa6aef216f8aea1a00b56aafc29b8745237a9b62 (diff)
misc: bh1780gli: 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 SIMPLE_DEV_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled. drivers/misc/bh1780gli.c:200:12: warning: 'bh1780_suspend' defined but not used [-Wunused-function] drivers/misc/bh1780gli.c:222:12: warning: 'bh1780_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>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/bh1780gli.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
index cf03d0abf33e..818f3a0e62bf 100644
--- a/drivers/misc/bh1780gli.c
+++ b/drivers/misc/bh1780gli.c
@@ -196,7 +196,7 @@ static int bh1780_remove(struct i2c_client *client)
196 return 0; 196 return 0;
197} 197}
198 198
199#ifdef CONFIG_PM 199#ifdef CONFIG_PM_SLEEP
200static int bh1780_suspend(struct device *dev) 200static int bh1780_suspend(struct device *dev)
201{ 201{
202 struct bh1780_data *ddata; 202 struct bh1780_data *ddata;
@@ -235,11 +235,9 @@ static int bh1780_resume(struct device *dev)
235 235
236 return 0; 236 return 0;
237} 237}
238#endif /* CONFIG_PM_SLEEP */
239
238static SIMPLE_DEV_PM_OPS(bh1780_pm, bh1780_suspend, bh1780_resume); 240static SIMPLE_DEV_PM_OPS(bh1780_pm, bh1780_suspend, bh1780_resume);
239#define BH1780_PMOPS (&bh1780_pm)
240#else
241#define BH1780_PMOPS NULL
242#endif /* CONFIG_PM */
243 241
244static const struct i2c_device_id bh1780_id[] = { 242static const struct i2c_device_id bh1780_id[] = {
245 { "bh1780", 0 }, 243 { "bh1780", 0 },
@@ -252,7 +250,7 @@ static struct i2c_driver bh1780_driver = {
252 .id_table = bh1780_id, 250 .id_table = bh1780_id,
253 .driver = { 251 .driver = {
254 .name = "bh1780", 252 .name = "bh1780",
255 .pm = BH1780_PMOPS, 253 .pm = &bh1780_pm,
256 }, 254 },
257}; 255};
258 256