Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 739808c9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

The alternative of CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME may be
replaced with CONFIG_PM too.

Make these changes in 2 files under drivers/video/.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
parent d39fe4e5

drivers/video/fbdev/s3c-fb.c

+1 −1
Original line number Diff line number Diff line
@@ -1630,7 +1630,7 @@ static int s3c_fb_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int s3c_fb_runtime_suspend(struct device *dev)

{

	struct s3c_fb *sfb = dev_get_drvdata(dev);

drivers/video/fbdev/sh_mobile_meram.c

+2 −2
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ EXPORT_SYMBOL_GPL(sh_mobile_meram_cache_update); 
 * Power management

 */



#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)

#ifdef CONFIG_PM

static int sh_mobile_meram_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);
@@ -612,7 +612,7 @@ static int sh_mobile_meram_resume(struct device *dev) 
		meram_write_reg(priv->base, common_regs[i], priv->regs[i]);

	return 0;

}

#endif /* CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static UNIVERSAL_DEV_PM_OPS(sh_mobile_meram_dev_pm_ops,

			    sh_mobile_meram_suspend,