Patchwork [v2] i2c: busses: i2c-ocores: Fix PM-related warning

login
register
mail settings
Submitter maxin.john@enea.com
Date March 4, 2013, 12:50 p.m.
Message ID <1362401415-63119-1-git-send-email-maxin.john@enea.com>
Download mbox | patch
Permalink /patch/224712/
State Superseded
Headers show

Comments

maxin.john@enea.com - March 4, 2013, 12:50 p.m.
From: "Maxin B. John" <maxin.john@enea.com>

The suspend/resume callbacks are unused w/o PM_SLEEP

Fixes this warning:
  CC      drivers/i2c/busses/i2c-ocores.o
drivers/i2c/busses/i2c-ocores.c:460:12: warning: 'ocores_i2c_suspend'
 defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-ocores.c:471:12: warning: 'ocores_i2c_resume'
defined but not used [-Wunused-function]

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 drivers/i2c/busses/i2c-ocores.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 0e1f824..1ecea5e 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -456,7 +456,7 @@  static int ocores_i2c_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ocores_i2c_suspend(struct device *dev)
 {
 	struct ocores_i2c *i2c = dev_get_drvdata(dev);
@@ -476,12 +476,9 @@  static int ocores_i2c_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);
-#define OCORES_I2C_PM	(&ocores_i2c_pm)
-#else
-#define OCORES_I2C_PM	NULL
-#endif
 
 static struct platform_driver ocores_i2c_driver = {
 	.probe   = ocores_i2c_probe,
@@ -490,7 +487,7 @@  static struct platform_driver ocores_i2c_driver = {
 		.owner = THIS_MODULE,
 		.name = "ocores-i2c",
 		.of_match_table = ocores_i2c_match,
-		.pm = OCORES_I2C_PM,
+		.pm = &ocores_i2c_pm,
 	},
 };