diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-14 22:28:23 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-08-15 06:23:57 -0400 |
commit | 0a488c49eac0ad851b1afbf12b345e2adaf3775c (patch) | |
tree | a63ccec132ff271f8771603ad67d79463a24c1eb /drivers | |
parent | 63151c539d790732f22d59d4c89766dd9b5284d2 (diff) |
i2c: i2c-mpc: 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-mpc.c:724:12: warning: 'mpc_i2c_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-mpc.c:734:12: warning: 'mpc_i2c_resume' defined but not used [-Wunused-function]
Also, this patch makes mpc_i2c_pm_ops static, because mpc_i2c_pm_ops
is not exported.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 99acf636e496..ffac2145b94a 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -64,7 +64,7 @@ struct mpc_i2c { | |||
64 | struct i2c_adapter adap; | 64 | struct i2c_adapter adap; |
65 | int irq; | 65 | int irq; |
66 | u32 real_clk; | 66 | u32 real_clk; |
67 | #ifdef CONFIG_PM | 67 | #ifdef CONFIG_PM_SLEEP |
68 | u8 fdr, dfsrr; | 68 | u8 fdr, dfsrr; |
69 | #endif | 69 | #endif |
70 | }; | 70 | }; |
@@ -723,7 +723,7 @@ static int fsl_i2c_remove(struct platform_device *op) | |||
723 | return 0; | 723 | return 0; |
724 | }; | 724 | }; |
725 | 725 | ||
726 | #ifdef CONFIG_PM | 726 | #ifdef CONFIG_PM_SLEEP |
727 | static int mpc_i2c_suspend(struct device *dev) | 727 | static int mpc_i2c_suspend(struct device *dev) |
728 | { | 728 | { |
729 | struct mpc_i2c *i2c = dev_get_drvdata(dev); | 729 | struct mpc_i2c *i2c = dev_get_drvdata(dev); |
@@ -744,7 +744,10 @@ static int mpc_i2c_resume(struct device *dev) | |||
744 | return 0; | 744 | return 0; |
745 | } | 745 | } |
746 | 746 | ||
747 | SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); | 747 | static SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); |
748 | #define MPC_I2C_PM_OPS (&mpc_i2c_pm_ops) | ||
749 | #else | ||
750 | #define MPC_I2C_PM_OPS NULL | ||
748 | #endif | 751 | #endif |
749 | 752 | ||
750 | static const struct mpc_i2c_data mpc_i2c_data_512x = { | 753 | static const struct mpc_i2c_data mpc_i2c_data_512x = { |
@@ -791,9 +794,7 @@ static struct platform_driver mpc_i2c_driver = { | |||
791 | .owner = THIS_MODULE, | 794 | .owner = THIS_MODULE, |
792 | .name = DRV_NAME, | 795 | .name = DRV_NAME, |
793 | .of_match_table = mpc_i2c_of_match, | 796 | .of_match_table = mpc_i2c_of_match, |
794 | #ifdef CONFIG_PM | 797 | .pm = MPC_I2C_PM_OPS, |
795 | .pm = &mpc_i2c_pm_ops, | ||
796 | #endif | ||
797 | }, | 798 | }, |
798 | }; | 799 | }; |
799 | 800 | ||