mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/3] misc: bh1780gli: add CONFIG_PM_SLEEP to suspend/resume functions
@ 2013-03-26  7:05 Jingoo Han
  2013-03-26  7:05 ` [PATCH 2/3] misc: bh1770glc: " Jingoo Han
  2013-03-26  7:05 ` [PATCH 3/3] misc: apds990x: " Jingoo Han
  0 siblings, 2 replies; 3+ messages in thread
From: Jingoo Han @ 2013-03-26  7:05 UTC (permalink / raw)
  To: 'Greg Kroah-Hartman'
  Cc: 'Arnd Bergmann', linux-kernel, 'Jingoo Han'

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>
---
 drivers/misc/bh1780gli.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
index cf03d0a..818f3a0 100644
--- a/drivers/misc/bh1780gli.c
+++ b/drivers/misc/bh1780gli.c
@@ -196,7 +196,7 @@ static int bh1780_remove(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int bh1780_suspend(struct device *dev)
 {
 	struct bh1780_data *ddata;
@@ -235,11 +235,9 @@ static int bh1780_resume(struct device *dev)
 
 	return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
+
 static SIMPLE_DEV_PM_OPS(bh1780_pm, bh1780_suspend, bh1780_resume);
-#define BH1780_PMOPS (&bh1780_pm)
-#else
-#define BH1780_PMOPS NULL
-#endif /* CONFIG_PM */
 
 static const struct i2c_device_id bh1780_id[] = {
 	{ "bh1780", 0 },
@@ -252,7 +250,7 @@ static struct i2c_driver bh1780_driver = {
 	.id_table	= bh1780_id,
 	.driver = {
 		.name = "bh1780",
-		.pm	= BH1780_PMOPS,
+		.pm	= &bh1780_pm,
 	},
 };
 
-- 
1.7.2.5



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-03-26  7:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-26  7:05 [PATCH 1/3] misc: bh1780gli: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
2013-03-26  7:05 ` [PATCH 2/3] misc: bh1770glc: " Jingoo Han
2013-03-26  7:05 ` [PATCH 3/3] misc: apds990x: " Jingoo Han

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®