* [PATCH] phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
@ 2014-12-06 2:39 Rafael J. Wysocki
2014-12-08 8:18 ` Kishon Vijay Abraham I
0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2014-12-06 2:39 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: Linux PM list, Linux Kernel Mailing List, Kevin Hilman
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.
Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
drivers/phy/.
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/phy/phy-omap-usb2.c | 2 +-
drivers/phy/phy-ti-pipe3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-pm/drivers/phy/phy-omap-usb2.c
===================================================================
--- linux-pm.orig/drivers/phy/phy-omap-usb2.c
+++ linux-pm/drivers/phy/phy-omap-usb2.c
@@ -322,7 +322,7 @@ static int omap_usb2_remove(struct platf
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int omap_usb2_runtime_suspend(struct device *dev)
{
Index: linux-pm/drivers/phy/phy-ti-pipe3.c
===================================================================
--- linux-pm.orig/drivers/phy/phy-ti-pipe3.c
+++ linux-pm/drivers/phy/phy-ti-pipe3.c
@@ -423,7 +423,7 @@ static int ti_pipe3_remove(struct platfo
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int ti_pipe3_runtime_suspend(struct device *dev)
{
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-06 2:39 [PATCH] phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
@ 2014-12-08 8:18 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 2+ messages in thread
From: Kishon Vijay Abraham I @ 2014-12-08 8:18 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM list, Linux Kernel Mailing List, Kevin Hilman
On Saturday 06 December 2014 08: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.
>
> Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
> drivers/phy/.
>
> 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.
Sure.
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
>
> ---
> drivers/phy/phy-omap-usb2.c | 2 +-
> drivers/phy/phy-ti-pipe3.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/phy/phy-omap-usb2.c
> ===================================================================
> --- linux-pm.orig/drivers/phy/phy-omap-usb2.c
> +++ linux-pm/drivers/phy/phy-omap-usb2.c
> @@ -322,7 +322,7 @@ static int omap_usb2_remove(struct platf
> return 0;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
>
> static int omap_usb2_runtime_suspend(struct device *dev)
> {
> Index: linux-pm/drivers/phy/phy-ti-pipe3.c
> ===================================================================
> --- linux-pm.orig/drivers/phy/phy-ti-pipe3.c
> +++ linux-pm/drivers/phy/phy-ti-pipe3.c
> @@ -423,7 +423,7 @@ static int ti_pipe3_remove(struct platfo
> return 0;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
>
> static int ti_pipe3_runtime_suspend(struct device *dev)
> {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-08 8:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-06 2:39 [PATCH] phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-08 8:18 ` Kishon Vijay Abraham I
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).