Patchwork [2/5] i2c: pnx: add CONFIG_PM_SLEEP to suspend/resume functions

login
register
mail settings
Submitter Jingoo Han
Date March 26, 2013, 6:56 a.m.
Message ID <001601ce29ef$0e0a1f30$2a1e5d90$%han@samsung.com>
Download mbox | patch
Permalink /patch/231100/
State Changes Requested
Headers show

Comments

Jingoo Han - March 26, 2013, 6:56 a.m.
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-pnx.c:599:12: warning: 'i2c_pnx_controller_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-pnx.c:608:12: warning: 'i2c_pnx_controller_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/i2c/busses/i2c-pnx.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 5f39c6d..af88b722 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -595,7 +595,7 @@  static struct i2c_algorithm pnx_algorithm = {
 	.functionality = i2c_pnx_func,
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int i2c_pnx_controller_suspend(struct device *dev)
 {
 	struct i2c_pnx_algo_data *alg_data = dev_get_drvdata(dev);
@@ -611,13 +611,10 @@  static int i2c_pnx_controller_resume(struct device *dev)
 
 	return clk_enable(alg_data->clk);
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(i2c_pnx_pm,
 			 i2c_pnx_controller_suspend, i2c_pnx_controller_resume);
-#define PNX_I2C_PM	(&i2c_pnx_pm)
-#else
-#define PNX_I2C_PM	NULL
-#endif
 
 static int i2c_pnx_probe(struct platform_device *pdev)
 {
@@ -792,7 +789,7 @@  static struct platform_driver i2c_pnx_driver = {
 		.name = "pnx-i2c",
 		.owner = THIS_MODULE,
 		.of_match_table = of_match_ptr(i2c_pnx_of_match),
-		.pm = PNX_I2C_PM,
+		.pm = &i2c_pnx_pm,
 	},
 	.probe = i2c_pnx_probe,
 	.remove = i2c_pnx_remove,