[media] media: st-rc: move pm ops setup out of conditional compilation (cdd9a631) · Commits · 戴 / test

This patch moves setting of pm_ops out of the CONFIG_PM_SLEEP condition. Setting pm ops under CONFIG_PM_SLEEP does not make any sense. This patch also remove unnecessary also remove CONFIG_PM condition for pm member in st_rc_driver structure. Signed-off-by:

Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Acked-by:

Maxime Coquelin <maxime.coquelin@st.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@osg.samsung.com>

drivers/media/rc/st_rc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -376,9 +376,10 @@ static int st_rc_resume(struct device *dev)
		return 0;
		}

		static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume);
		#endif

		static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume);

		#ifdef CONFIG_OF
		static struct of_device_id st_rc_match[] = {
		{ .compatible = "st,comms-irb", },
		@@ -393,9 +394,7 @@ static struct platform_driver st_rc_driver = {
		.name = IR_ST_NAME,
		.owner = THIS_MODULE,
		.of_match_table = of_match_ptr(st_rc_match),
		#ifdef CONFIG_PM
		.pm = &st_rc_pm_ops,
		#endif
		},
		.probe = st_rc_probe,
		.remove = st_rc_remove,

Admin message