diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-14 22:28:59 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-08-15 06:24:23 -0400 |
commit | dfb03fb246dc893743a28d00966b1862ae836f2d (patch) | |
tree | 32baeaeb245ff758bae7d96491886e0df554cefd /drivers/i2c/busses/i2c-designware-platdrv.c | |
parent | 0a488c49eac0ad851b1afbf12b345e2adaf3775c (diff) |
i2c: designware: 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/i2c/busses/i2c-designware-platdrv.c:211:12: warning: 'dw_i2c_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-designware-platdrv.c:221:12: warning: 'dw_i2c_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-platdrv.c')
-rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 4c5fadabe49d..64ffb908641c 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c | |||
@@ -207,7 +207,7 @@ static const struct of_device_id dw_i2c_of_match[] = { | |||
207 | MODULE_DEVICE_TABLE(of, dw_i2c_of_match); | 207 | MODULE_DEVICE_TABLE(of, dw_i2c_of_match); |
208 | #endif | 208 | #endif |
209 | 209 | ||
210 | #ifdef CONFIG_PM | 210 | #ifdef CONFIG_PM_SLEEP |
211 | static int dw_i2c_suspend(struct device *dev) | 211 | static int dw_i2c_suspend(struct device *dev) |
212 | { | 212 | { |
213 | struct platform_device *pdev = to_platform_device(dev); | 213 | struct platform_device *pdev = to_platform_device(dev); |
@@ -228,9 +228,12 @@ static int dw_i2c_resume(struct device *dev) | |||
228 | 228 | ||
229 | return 0; | 229 | return 0; |
230 | } | 230 | } |
231 | #endif | ||
232 | 231 | ||
233 | static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume); | 232 | static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume); |
233 | #define DW_I2C_DEV_PM_OPS (&dw_i2c_dev_pm_ops) | ||
234 | #else | ||
235 | #define DW_I2C_DEV_PM_OPS NULL | ||
236 | #endif | ||
234 | 237 | ||
235 | /* work with hotplug and coldplug */ | 238 | /* work with hotplug and coldplug */ |
236 | MODULE_ALIAS("platform:i2c_designware"); | 239 | MODULE_ALIAS("platform:i2c_designware"); |
@@ -242,7 +245,7 @@ static struct platform_driver dw_i2c_driver = { | |||
242 | .owner = THIS_MODULE, | 245 | .owner = THIS_MODULE, |
243 | .of_match_table = of_match_ptr(dw_i2c_of_match), | 246 | .of_match_table = of_match_ptr(dw_i2c_of_match), |
244 | .acpi_match_table = ACPI_PTR(dw_i2c_acpi_match), | 247 | .acpi_match_table = ACPI_PTR(dw_i2c_acpi_match), |
245 | .pm = &dw_i2c_dev_pm_ops, | 248 | .pm = DW_I2C_DEV_PM_OPS, |
246 | }, | 249 | }, |
247 | }; | 250 | }; |
248 | 251 | ||