From: Srinivas Kandagatla Date: Mon, 22 Sep 2014 22:22:38 +0000 (-0300) Subject: [media] media: st-rc: move pm ops setup out of conditional compilation X-Git-Tag: firefly_0821_release~176^2~2474^2~471 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cdd9a6316bfb85176aba83e9532fbc46c9588378;p=firefly-linux-kernel-4.4.55.git [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: Srinivas Kandagatla Acked-by: Maxime Coquelin Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c index e0f13125bf06..03bbb096cb9b 100644 --- a/drivers/media/rc/st_rc.c +++ b/drivers/media/rc/st_rc.c @@ -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,