|
@@ -64,7 +64,7 @@ struct mpc_i2c {
|
|
|
struct i2c_adapter adap;
|
|
|
int irq;
|
|
|
u32 real_clk;
|
|
|
-#ifdef CONFIG_PM
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
u8 fdr, dfsrr;
|
|
|
#endif
|
|
|
};
|
|
@@ -723,7 +723,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);
|
|
@@ -744,7 +744,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);
|
|
|
+static SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
|
|
|
+#define MPC_I2C_PM_OPS (&mpc_i2c_pm_ops)
|
|
|
+#else
|
|
|
+#define MPC_I2C_PM_OPS NULL
|
|
|
#endif
|
|
|
|
|
|
static const struct mpc_i2c_data mpc_i2c_data_512x = {
|
|
@@ -791,9 +794,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
|
|
|
+ .pm = MPC_I2C_PM_OPS,
|
|
|
},
|
|
|
};
|
|
|
|