Patchwork i2c: i2c-mpc: make mpc_i2c_pm_ops static

login
register
mail settings
Submitter Jingoo Han
Date March 19, 2013, 1:07 a.m.
Message ID <006601ce243e$200a47c0$601ed740$%han@samsung.com>
Download mbox | patch
Permalink /patch/228886/
State Rejected
Headers show

Comments

Jingoo Han - March 19, 2013, 1:07 a.m.
mpc_i2c_pm_ops is not exported. Also, CONFIG_PM_SLEEP is used to
remove unnecessary ifdefs.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/i2c/busses/i2c-mpc.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
Wolfram Sang - June 11, 2013, 7:29 p.m.
On Tue, Mar 19, 2013 at 10:07:28AM +0900, Jingoo Han wrote:
> mpc_i2c_pm_ops is not exported. Also, CONFIG_PM_SLEEP is used to
> remove unnecessary ifdefs.

I guess we should use the new pm_ops_ptr macro which is scheduled for
3.11.

Thanks,

   Wolfram

Patch

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 5e705ee..40e8ff4 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -720,7 +720,7 @@  static int fsl_i2c_remove(struct platform_device *op)
 	return 0;
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int mpc_i2c_suspend(struct device *dev)
 {
 	struct mpc_i2c *i2c = dev_get_drvdata(dev);
@@ -740,10 +740,10 @@  static int mpc_i2c_resume(struct device *dev)
 
 	return 0;
 }
-
-SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
 #endif
 
+static SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
+
 static const struct mpc_i2c_data mpc_i2c_data_512x = {
 	.setup = mpc_i2c_setup_512x,
 };
@@ -788,9 +788,7 @@  static struct platform_driver mpc_i2c_driver = {
 		.owner = THIS_MODULE,
 		.name = DRV_NAME,
 		.of_match_table = mpc_i2c_of_match,
-#ifdef CONFIG_PM
 		.pm = &mpc_i2c_pm_ops,
-#endif
 	},
 };