提交 dc5686e4 编写于 作者: R Rafael J. Wysocki

input / 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/input/.
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: NJingoo Han <jg1.han@samsung.com>
Reviewed-by: NFerruh Yigit <fery@cypress.com>
Acked-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
上级 6f0a13f2
...@@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct platform_device *pdev) ...@@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int samsung_keypad_runtime_suspend(struct device *dev) static int samsung_keypad_runtime_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
......
...@@ -1716,7 +1716,7 @@ static void cyttsp4_free_si_ptrs(struct cyttsp4 *cd) ...@@ -1716,7 +1716,7 @@ static void cyttsp4_free_si_ptrs(struct cyttsp4 *cd)
kfree(si->btn_rec_data); kfree(si->btn_rec_data);
} }
#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME) #ifdef CONFIG_PM
static int cyttsp4_core_sleep(struct cyttsp4 *cd) static int cyttsp4_core_sleep(struct cyttsp4 *cd)
{ {
int rc; int rc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册