Commit cdd9a631 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mauro Carvalho Chehab

[media] media: st-rc: move pm ops setup out of conditional compilation

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: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 89d7ce5a
...@@ -376,9 +376,10 @@ static int st_rc_resume(struct device *dev) ...@@ -376,9 +376,10 @@ static int st_rc_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume);
#endif #endif
static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume);
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id st_rc_match[] = { static struct of_device_id st_rc_match[] = {
{ .compatible = "st,comms-irb", }, { .compatible = "st,comms-irb", },
...@@ -393,9 +394,7 @@ static struct platform_driver st_rc_driver = { ...@@ -393,9 +394,7 @@ static struct platform_driver st_rc_driver = {
.name = IR_ST_NAME, .name = IR_ST_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(st_rc_match), .of_match_table = of_match_ptr(st_rc_match),
#ifdef CONFIG_PM
.pm = &st_rc_pm_ops, .pm = &st_rc_pm_ops,
#endif
}, },
.probe = st_rc_probe, .probe = st_rc_probe,
.remove = st_rc_remove, .remove = st_rc_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment