Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

After commit b2b49ccbdd54 (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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Ferruh Yigit <fery@cypress.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

+2 -2
+1 -1
drivers/input/keyboard/samsung-keypad.c
··· 463 463 return 0; 464 464 } 465 465 466 - #ifdef CONFIG_PM_RUNTIME 466 + #ifdef CONFIG_PM 467 467 static int samsung_keypad_runtime_suspend(struct device *dev) 468 468 { 469 469 struct platform_device *pdev = to_platform_device(dev);
+1 -1
drivers/input/touchscreen/cyttsp4_core.c
··· 1716 1716 kfree(si->btn_rec_data); 1717 1717 } 1718 1718 1719 - #if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME) 1719 + #ifdef CONFIG_PM 1720 1720 static int cyttsp4_core_sleep(struct cyttsp4 *cd) 1721 1721 { 1722 1722 int rc;