i2c: i2c-mpc: add CONFIG_PM_SLEEP to suspend/resume functions (0a488c49) · Commits · 戴 / test

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>

drivers/i2c/busses/i2c-mpc.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};

Admin message