korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 00:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Srinivas Kandagatla 2014-09-22 19:22:38 -03:00 committed by Mauro Carvalho Chehab
parent 89d7ce5a0f
commit cdd9a6316b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/rc/st_rc.c
View File

@ -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,