Commit 8b80ef64 authored Apr 29, 2013 by Jingoo Han Committed by Linus Torvalds Apr 29, 2013

drivers/rtc/rtc-ds1374.c: 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/rtc/rtc-ds1374.c:413:12: warning: 'ds1374_suspend' defined but not used [-Wunused-function]
drivers/rtc/rtc-ds1374.c:422:12: warning: 'ds1374_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0288d2e3

drivers/rtc/rtc-ds1374.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -409,7 +409,7 @@ static int ds1374_remove(struct i2c_client *client)
		return 0;
		}

		#ifdef CONFIG_PM
		#ifdef CONFIG_PM_SLEEP
		static int ds1374_suspend(struct device *dev)
		{
		struct i2c_client *client = to_i2c_client(dev);
		@@ -427,19 +427,15 @@ static int ds1374_resume(struct device *dev)
		disable_irq_wake(client->irq);
		return 0;
		}
		#endif

		static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume);

		#define DS1374_PM (&ds1374_pm)
		#else
		#define DS1374_PM NULL
		#endif

		static struct i2c_driver ds1374_driver = {
		.driver = {
		.name = "rtc-ds1374",
		.owner = THIS_MODULE,
		.pm = DS1374_PM,
		.pm = &ds1374_pm,
		},
		.probe = ds1374_probe,
		.remove = ds1374_remove,

Admin message