* Re: [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-03 2:09 [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
@ 2014-12-03 2:02 ` Jingoo Han
2014-12-03 5:54 ` Dmitry Torokhov
2014-12-04 7:58 ` Ferruh Yigit
2 siblings, 0 replies; 4+ messages in thread
From: Jingoo Han @ 2014-12-03 2:02 UTC (permalink / raw)
To: 'Rafael J. Wysocki', 'Dmitry Torokhov'
Cc: linux-input, 'Paul Gortmaker', 'Ferruh Yigit',
'Linux Kernel Mailing List', 'Linux PM list',
'Jingoo Han'
On Wednesday, December 03, 2014 11:09 AM, Rafael J. Wysocki wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> 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>
Best regards,
Jingoo Han
> ---
>
> Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
> PM_SLEEP is selected) which is only in linux-next at the moment (via the
> linux-pm tree).
>
> Please let me know if it is OK to take this one into linux-pm.
>
> ---
> drivers/input/keyboard/samsung-keypad.c | 2 +-
> drivers/input/touchscreen/cyttsp4_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/input/keyboard/samsung-keypad.c
> ===================================================================
> --- linux-pm.orig/drivers/input/keyboard/samsung-keypad.c
> +++ linux-pm/drivers/input/keyboard/samsung-keypad.c
> @@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct
> return 0;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
> static int samsung_keypad_runtime_suspend(struct device *dev)
> {
> struct platform_device *pdev = to_platform_device(dev);
> Index: linux-pm/drivers/input/touchscreen/cyttsp4_core.c
> ===================================================================
> --- linux-pm.orig/drivers/input/touchscreen/cyttsp4_core.c
> +++ linux-pm/drivers/input/touchscreen/cyttsp4_core.c
> @@ -1716,7 +1716,7 @@ static void cyttsp4_free_si_ptrs(struct
> 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)
> {
> int rc;
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
@ 2014-12-03 2:09 Rafael J. Wysocki
2014-12-03 2:02 ` Jingoo Han
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2014-12-03 2:09 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-input, Jingoo Han, Paul Gortmaker, Ferruh Yigit,
Linux Kernel Mailing List, Linux PM list
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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>
---
Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
PM_SLEEP is selected) which is only in linux-next at the moment (via the
linux-pm tree).
Please let me know if it is OK to take this one into linux-pm.
---
drivers/input/keyboard/samsung-keypad.c | 2 +-
drivers/input/touchscreen/cyttsp4_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-pm/drivers/input/keyboard/samsung-keypad.c
===================================================================
--- linux-pm.orig/drivers/input/keyboard/samsung-keypad.c
+++ linux-pm/drivers/input/keyboard/samsung-keypad.c
@@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int samsung_keypad_runtime_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
Index: linux-pm/drivers/input/touchscreen/cyttsp4_core.c
===================================================================
--- linux-pm.orig/drivers/input/touchscreen/cyttsp4_core.c
+++ linux-pm/drivers/input/touchscreen/cyttsp4_core.c
@@ -1716,7 +1716,7 @@ static void cyttsp4_free_si_ptrs(struct
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)
{
int rc;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-03 2:09 [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-03 2:02 ` Jingoo Han
@ 2014-12-03 5:54 ` Dmitry Torokhov
2014-12-04 7:58 ` Ferruh Yigit
2 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2014-12-03 5:54 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-input, Jingoo Han, Paul Gortmaker, Ferruh Yigit,
Linux Kernel Mailing List, Linux PM list
On Wed, Dec 03, 2014 at 03:09:10AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> 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>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>
> Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
> PM_SLEEP is selected) which is only in linux-next at the moment (via the
> linux-pm tree).
>
> Please let me know if it is OK to take this one into linux-pm.
Yeah, it should be fine.
>
> ---
> drivers/input/keyboard/samsung-keypad.c | 2 +-
> drivers/input/touchscreen/cyttsp4_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/input/keyboard/samsung-keypad.c
> ===================================================================
> --- linux-pm.orig/drivers/input/keyboard/samsung-keypad.c
> +++ linux-pm/drivers/input/keyboard/samsung-keypad.c
> @@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct
> return 0;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
> static int samsung_keypad_runtime_suspend(struct device *dev)
> {
> struct platform_device *pdev = to_platform_device(dev);
> Index: linux-pm/drivers/input/touchscreen/cyttsp4_core.c
> ===================================================================
> --- linux-pm.orig/drivers/input/touchscreen/cyttsp4_core.c
> +++ linux-pm/drivers/input/touchscreen/cyttsp4_core.c
> @@ -1716,7 +1716,7 @@ static void cyttsp4_free_si_ptrs(struct
> 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)
> {
> int rc;
>
--
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-03 2:09 [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-03 2:02 ` Jingoo Han
2014-12-03 5:54 ` Dmitry Torokhov
@ 2014-12-04 7:58 ` Ferruh Yigit
2 siblings, 0 replies; 4+ messages in thread
From: Ferruh Yigit @ 2014-12-04 7:58 UTC (permalink / raw)
To: Rafael J. Wysocki, Dmitry Torokhov
Cc: linux-input, Jingoo Han, Paul Gortmaker,
Linux Kernel Mailing List, Linux PM list
On 12/03/2014 03:47 AM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> 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: Ferruh Yigit <fery@cypress.com>
> ---
>
> Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
> PM_SLEEP is selected) which is only in linux-next at the moment (via the
> linux-pm tree).
>
> Please let me know if it is OK to take this one into linux-pm.
>
> ---
> drivers/input/keyboard/samsung-keypad.c | 2 +-
> drivers/input/touchscreen/cyttsp4_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/input/keyboard/samsung-keypad.c
> ===================================================================
> --- linux-pm.orig/drivers/input/keyboard/samsung-keypad.c
> +++ linux-pm/drivers/input/keyboard/samsung-keypad.c
> @@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct
> return 0;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
> static int samsung_keypad_runtime_suspend(struct device *dev)
> {
> struct platform_device *pdev = to_platform_device(dev);
> Index: linux-pm/drivers/input/touchscreen/cyttsp4_core.c
> ===================================================================
> --- linux-pm.orig/drivers/input/touchscreen/cyttsp4_core.c
> +++ linux-pm/drivers/input/touchscreen/cyttsp4_core.c
> @@ -1716,7 +1716,7 @@ static void cyttsp4_free_si_ptrs(struct
> 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)
> {
> int rc;
>
>
--
regards,
ferruh
This message and any attachments may contain Cypress (or its subsidiaries) confidential information. If it has been received in error, please advise the sender and immediately delete this message.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-04 7:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-03 2:09 [PATCH] input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-03 2:02 ` Jingoo Han
2014-12-03 5:54 ` Dmitry Torokhov
2014-12-04 7:58 ` Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).