* [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME
@ 2014-12-19 1:42 Rafael J. Wysocki
2014-12-19 1:49 ` [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 1:42 UTC (permalink / raw)
To: Linux PM list; +Cc: Linux Kernel Mailing List, Ulf Hansson, Kevin Hilman
Hi,
This is the last part of the CONFIG_PM_RUNTIME elimination work.
Patches [1-3/4] deal with the new uses of CONFIG_PM_RUNTIME that have
been added since the beginning of the current merge window and the last
one removes CONFIG_PM_RUNTIME and makes CONFIG_PM be a user-selectable
option.
This is on top of the current Linus' tree with my master branch merged
on top which should be a subset of current linux-next.
Thanks!
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:42 [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME Rafael J. Wysocki
@ 2014-12-19 1:49 ` Rafael J. Wysocki
2014-12-19 11:39 ` Mark Brown
2014-12-19 1:51 ` [PATCH 2/4] sound: sst-haswell-pcm: " Rafael J. Wysocki
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 1:49 UTC (permalink / raw)
To: Linux PM list, Mark Brown
Cc: Linux Kernel Mailing List, Ulf Hansson, Kevin Hilman, linux-spi
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
A couple of new CONFIG_PM_RUNTIME users have been added recently
in the SPI subsystem.
However, 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/spi/ (again).
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
Please let me know if there are any objections against pushing this through
the linux-pm tree.
---
drivers/spi/spi-img-spfi.c | 4 ++--
drivers/spi/spi-meson-spifc.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: linux-pm/drivers/spi/spi-meson-spifc.c
===================================================================
--- linux-pm.orig/drivers/spi/spi-meson-spifc.c
+++ linux-pm/drivers/spi/spi-meson-spifc.c
@@ -413,7 +413,7 @@ static int meson_spifc_resume(struct dev
}
#endif /* CONFIG_PM_SLEEP */
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int meson_spifc_runtime_suspend(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
@@ -431,7 +431,7 @@ static int meson_spifc_runtime_resume(st
return clk_prepare_enable(spifc->clk);
}
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
static const struct dev_pm_ops meson_spifc_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume)
Index: linux-pm/drivers/spi/spi-img-spfi.c
===================================================================
--- linux-pm.orig/drivers/spi/spi-img-spfi.c
+++ linux-pm/drivers/spi/spi-img-spfi.c
@@ -663,7 +663,7 @@ static int img_spfi_remove(struct platfo
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int img_spfi_runtime_suspend(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
@@ -692,7 +692,7 @@ static int img_spfi_runtime_resume(struc
return 0;
}
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
#ifdef CONFIG_PM_SLEEP
static int img_spfi_suspend(struct device *dev)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/4] sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:42 [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19 1:49 ` [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
@ 2014-12-19 1:51 ` Rafael J. Wysocki
2014-12-19 11:41 ` Mark Brown
2014-12-19 1:55 ` [PATCH 3/4] tty: 8250_omap: " Rafael J. Wysocki
2014-12-19 2:03 ` [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME Rafael J. Wysocki
3 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 1:51 UTC (permalink / raw)
To: Linux PM list, Mark Brown
Cc: Linux Kernel Mailing List, Ulf Hansson, Kevin Hilman,
Liam Girdwood, Takashi Iwai
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
The sst-haswell-pcm driver is a new user of CONFIG_PM_RUNTIME.
However, 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 in
sound/soc/intel/sst-haswell-pcm.c.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
Please let me know if there are any objections against pushing this through
the linux-pm tree.
---
sound/soc/intel/sst-haswell-pcm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-pm/sound/soc/intel/sst-haswell-pcm.c
===================================================================
--- linux-pm.orig/sound/soc/intel/sst-haswell-pcm.c
+++ linux-pm/sound/soc/intel/sst-haswell-pcm.c
@@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct pla
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int hsw_pcm_runtime_idle(struct device *dev)
{
@@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct
#define hsw_pcm_runtime_resume NULL
#endif
-#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME)
+#ifdef CONFIG_PM
static void hsw_pcm_complete(struct device *dev)
{
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/4] tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:42 [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19 1:49 ` [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-19 1:51 ` [PATCH 2/4] sound: sst-haswell-pcm: " Rafael J. Wysocki
@ 2014-12-19 1:55 ` Rafael J. Wysocki
2014-12-19 1:57 ` Greg Kroah-Hartman
2014-12-19 2:03 ` [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME Rafael J. Wysocki
3 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 1:55 UTC (permalink / raw)
To: Linux PM list, Greg Kroah-Hartman
Cc: Linux Kernel Mailing List, Ulf Hansson, Kevin Hilman, Jiri Slaby,
Heikki Krogerus, linux-serial
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
The 8250_omap serial driver is a new user of CONFIG_PM_RUNTIME.
However, 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 in 8250_omap.c.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
Please let me know if there are any objections against pushing this through
the linux-pm tree.
---
drivers/tty/serial/8250/8250_omap.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: linux-pm/drivers/tty/serial/8250/8250_omap.c
===================================================================
--- linux-pm.orig/drivers/tty/serial/8250/8250_omap.c
+++ linux-pm/drivers/tty/serial/8250/8250_omap.c
@@ -561,7 +561,7 @@ static int omap_8250_startup(struct uart
if (ret)
goto err;
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
up->capabilities |= UART_CAP_RPM;
#endif
@@ -997,12 +997,12 @@ static int omap8250_probe(struct platfor
up.port.fifosize = 64;
up.tx_loadsz = 64;
up.capabilities = UART_CAP_FIFO;
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
/*
- * PM_RUNTIME is mostly transparent. However to do it right we need to a
+ * Runtime PM is mostly transparent. However to do it right we need to a
* TX empty interrupt before we can put the device to auto idle. So if
- * PM_RUNTIME is not enabled we don't add that flag and can spare that
- * one extra interrupt in the TX path.
+ * PM is not enabled we don't add that flag and can spare that one extra
+ * interrupt in the TX path.
*/
up.capabilities |= UART_CAP_RPM;
#endif
@@ -1105,7 +1105,7 @@ static int omap8250_remove(struct platfo
return 0;
}
-#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
+#ifdef CONFIG_PM
static inline void omap8250_enable_wakeirq(struct omap8250_priv *priv,
bool enable)
@@ -1179,7 +1179,7 @@ static int omap8250_resume(struct device
#define omap8250_complete NULL
#endif
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int omap8250_lost_context(struct uart_8250_port *up)
{
u32 val;
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:55 ` [PATCH 3/4] tty: 8250_omap: " Rafael J. Wysocki
@ 2014-12-19 1:57 ` Greg Kroah-Hartman
2014-12-19 2:23 ` Rafael J. Wysocki
0 siblings, 1 reply; 14+ messages in thread
From: Greg Kroah-Hartman @ 2014-12-19 1:57 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Linux PM list, Linux Kernel Mailing List, Ulf Hansson,
Kevin Hilman, Jiri Slaby, Heikki Krogerus, linux-serial
On Fri, Dec 19, 2014 at 02:55:00AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> The 8250_omap serial driver is a new user of CONFIG_PM_RUNTIME.
>
> However, 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 in 8250_omap.c.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>
> Please let me know if there are any objections against pushing this through
> the linux-pm tree.
Please do:
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 1:42 [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME Rafael J. Wysocki
` (2 preceding siblings ...)
2014-12-19 1:55 ` [PATCH 3/4] tty: 8250_omap: " Rafael J. Wysocki
@ 2014-12-19 2:03 ` Rafael J. Wysocki
2014-12-19 7:44 ` Ulf Hansson
2014-12-19 8:13 ` Geert Uytterhoeven
3 siblings, 2 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 2:03 UTC (permalink / raw)
To: Linux PM list
Cc: Linux Kernel Mailing List, Ulf Hansson, Kevin Hilman,
Greg Kroah-Hartman, Simon Horman, Magnus Damm, Russell King,
Christian Daudt, Matt Porter, Kukjin Kim, Shawn Guo,
Sascha Hauer, Maxime Ripard, Stephen Warren, Thierry Reding,
Alexandre Courbot, Tony Lindgren, Ralf Baechle,
Benjamin Herrenschmidt, Mark Brown, Olof Johansson,
linux-arm-kernel, linux-usb, linux-samsung-soc
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Having switched over all of the users of CONFIG_PM_RUNTIME to use
CONFIG_PM directly, turn the latter into a user-selectable option
and drop the former entirely from the tree.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
arch/arm/configs/ape6evm_defconfig | 2 +-
arch/arm/configs/armadillo800eva_defconfig | 2 +-
arch/arm/configs/bcm_defconfig | 2 +-
arch/arm/configs/bockw_defconfig | 2 +-
arch/arm/configs/davinci_all_defconfig | 2 +-
arch/arm/configs/exynos_defconfig | 2 +-
arch/arm/configs/ezx_defconfig | 2 +-
arch/arm/configs/hisi_defconfig | 2 +-
arch/arm/configs/imote2_defconfig | 2 +-
arch/arm/configs/imx_v6_v7_defconfig | 2 +-
arch/arm/configs/keystone_defconfig | 2 +-
arch/arm/configs/kzm9g_defconfig | 2 +-
arch/arm/configs/lager_defconfig | 2 +-
arch/arm/configs/mackerel_defconfig | 2 +-
arch/arm/configs/marzen_defconfig | 2 +-
arch/arm/configs/omap1_defconfig | 2 +-
arch/arm/configs/prima2_defconfig | 2 +-
arch/arm/configs/sama5_defconfig | 2 +-
arch/arm/configs/shmobile_defconfig | 2 +-
arch/arm/configs/sunxi_defconfig | 2 +-
arch/arm/configs/tegra_defconfig | 2 +-
arch/arm/configs/u8500_defconfig | 2 +-
arch/arm/configs/vt8500_v6_v7_defconfig | 2 +-
arch/arm/mach-omap2/Kconfig | 6 +++---
arch/mips/configs/db1xxx_defconfig | 2 +-
arch/mips/configs/lemote2f_defconfig | 2 +-
arch/mips/configs/loongson3_defconfig | 2 +-
arch/mips/configs/nlm_xlp_defconfig | 2 +-
arch/mips/configs/nlm_xlr_defconfig | 2 +-
arch/powerpc/configs/ps3_defconfig | 2 +-
arch/sh/Kconfig | 2 +-
arch/sh/configs/apsh4ad0a_defconfig | 2 +-
arch/sh/configs/sdk7786_defconfig | 2 +-
drivers/usb/host/isp1760-hcd.c | 2 +-
drivers/usb/host/oxu210hp-hcd.c | 2 +-
include/linux/devfreq.h | 2 +-
kernel/power/Kconfig | 16 ++++++----------
37 files changed, 44 insertions(+), 48 deletions(-)
Index: linux-pm/arch/arm/configs/ape6evm_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/ape6evm_defconfig
+++ linux-pm/arch/arm/configs/ape6evm_defconfig
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/armadillo800eva_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/armadillo800eva_defconfig
+++ linux-pm/arch/arm/configs/armadillo800eva_defconfig
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/bcm_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/bcm_defconfig
+++ linux-pm/arch/arm/configs/bcm_defconfig
@@ -39,7 +39,7 @@ CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=y
Index: linux-pm/arch/arm/configs/bockw_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/bockw_defconfig
+++ linux-pm/arch/arm/configs/bockw_defconfig
@@ -29,7 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/davinci_all_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/davinci_all_defconfig
+++ linux-pm/arch/arm/configs/davinci_all_defconfig
@@ -49,7 +49,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_IDLE=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/exynos_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/exynos_defconfig
+++ linux-pm/arch/arm/configs/exynos_defconfig
@@ -27,7 +27,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/ezx_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/ezx_defconfig
+++ linux-pm/arch/arm/configs/ezx_defconfig
@@ -39,7 +39,7 @@ CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
CONFIG_PM=y
CONFIG_APM_EMULATION=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/hisi_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/hisi_defconfig
+++ linux-pm/arch/arm/configs/hisi_defconfig
@@ -18,7 +18,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_NEON=y
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/imote2_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/imote2_defconfig
+++ linux-pm/arch/arm/configs/imote2_defconfig
@@ -31,7 +31,7 @@ CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
CONFIG_PM=y
CONFIG_APM_EMULATION=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/imx_v6_v7_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/imx_v6_v7_defconfig
+++ linux-pm/arch/arm/configs/imx_v6_v7_defconfig
@@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
CONFIG_NET=y
Index: linux-pm/arch/arm/configs/keystone_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/keystone_defconfig
+++ linux-pm/arch/arm/configs/keystone_defconfig
@@ -30,7 +30,7 @@ CONFIG_HIGHMEM=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_SUSPEND is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/kzm9g_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/kzm9g_defconfig
+++ linux-pm/arch/arm/configs/kzm9g_defconfig
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/lager_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/lager_defconfig
+++ linux-pm/arch/arm/configs/lager_defconfig
@@ -37,7 +37,7 @@ CONFIG_AUTO_ZRELADDR=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/mackerel_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/mackerel_defconfig
+++ linux-pm/arch/arm/configs/mackerel_defconfig
@@ -28,7 +28,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/marzen_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/marzen_defconfig
+++ linux-pm/arch/arm/configs/marzen_defconfig
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
CONFIG_KEXEC=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/omap1_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/omap1_defconfig
+++ linux-pm/arch/arm/configs/omap1_defconfig
@@ -63,7 +63,7 @@ CONFIG_FPE_NWFPE=y
CONFIG_BINFMT_MISC=y
CONFIG_PM=y
# CONFIG_SUSPEND is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/prima2_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/prima2_defconfig
+++ linux-pm/arch/arm/configs/prima2_defconfig
@@ -18,7 +18,7 @@ CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_KEXEC=y
CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
Index: linux-pm/arch/arm/configs/sama5_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/sama5_defconfig
+++ linux-pm/arch/arm/configs/sama5_defconfig
@@ -32,7 +32,7 @@ CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_KERNEL_MODE_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_NET=y
Index: linux-pm/arch/arm/configs/shmobile_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/shmobile_defconfig
+++ linux-pm/arch/arm/configs/shmobile_defconfig
@@ -39,7 +39,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/sunxi_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/sunxi_defconfig
+++ linux-pm/arch/arm/configs/sunxi_defconfig
@@ -11,7 +11,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/tegra_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/tegra_defconfig
+++ linux-pm/arch/arm/configs/tegra_defconfig
@@ -46,7 +46,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/u8500_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/u8500_defconfig
+++ linux-pm/arch/arm/configs/u8500_defconfig
@@ -25,7 +25,7 @@ CONFIG_CPU_IDLE=y
CONFIG_ARM_U8500_CPUIDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/vt8500_v6_v7_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/vt8500_v6_v7_defconfig
+++ linux-pm/arch/arm/configs/vt8500_v6_v7_defconfig
@@ -16,7 +16,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_UNIX=y
CONFIG_INET=y
Index: linux-pm/arch/mips/configs/db1xxx_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/db1xxx_defconfig
+++ linux-pm/arch/mips/configs/db1xxx_defconfig
@@ -36,7 +36,7 @@ CONFIG_PCI=y
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
CONFIG_PCCARD=y
CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=y
Index: linux-pm/arch/mips/configs/lemote2f_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/lemote2f_defconfig
+++ linux-pm/arch/mips/configs/lemote2f_defconfig
@@ -37,7 +37,7 @@ CONFIG_MIPS32_N32=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION="/dev/hda3"
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=m
Index: linux-pm/arch/mips/configs/loongson3_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/loongson3_defconfig
+++ linux-pm/arch/mips/configs/loongson3_defconfig
@@ -58,7 +58,7 @@ CONFIG_BINFMT_MISC=m
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/mips/configs/nlm_xlp_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/nlm_xlp_defconfig
+++ linux-pm/arch/mips/configs/nlm_xlp_defconfig
@@ -61,7 +61,7 @@ CONFIG_BINFMT_MISC=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/mips/configs/nlm_xlr_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/nlm_xlr_defconfig
+++ linux-pm/arch/mips/configs/nlm_xlr_defconfig
@@ -41,7 +41,7 @@ CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_DEBUG=y
CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/powerpc/configs/ps3_defconfig
===================================================================
--- linux-pm.orig/arch/powerpc/configs/ps3_defconfig
+++ linux-pm/arch/powerpc/configs/ps3_defconfig
@@ -36,7 +36,7 @@ CONFIG_KEXEC=y
CONFIG_SCHED_SMT=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE=""
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
# CONFIG_SECCOMP is not set
# CONFIG_PCI is not set
Index: linux-pm/arch/sh/configs/apsh4ad0a_defconfig
===================================================================
--- linux-pm.orig/arch/sh/configs/apsh4ad0a_defconfig
+++ linux-pm/arch/sh/configs/apsh4ad0a_defconfig
@@ -47,7 +47,7 @@ CONFIG_PREEMPT=y
CONFIG_BINFMT_MISC=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_CPU_IDLE=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/sh/configs/sdk7786_defconfig
===================================================================
--- linux-pm.orig/arch/sh/configs/sdk7786_defconfig
+++ linux-pm/arch/sh/configs/sdk7786_defconfig
@@ -82,7 +82,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_MISC=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_CPU_IDLE=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/arm/mach-omap2/Kconfig
===================================================================
--- linux-pm.orig/arch/arm/mach-omap2/Kconfig
+++ linux-pm/arch/arm/mach-omap2/Kconfig
@@ -15,7 +15,7 @@ config ARCH_OMAP3
select ARM_CPU_SUSPEND if PM
select OMAP_INTERCONNECT
select PM_OPP if PM
- select PM_RUNTIME if CPU_IDLE
+ select PM if CPU_IDLE
select SOC_HAS_OMAP2_SDRC
config ARCH_OMAP4
@@ -32,7 +32,7 @@ config ARCH_OMAP4
select PL310_ERRATA_588369 if CACHE_L2X0
select PL310_ERRATA_727915 if CACHE_L2X0
select PM_OPP if PM
- select PM_RUNTIME if CPU_IDLE
+ select PM if CPU_IDLE
select ARM_ERRATA_754322
select ARM_ERRATA_775420
@@ -103,7 +103,7 @@ config ARCH_OMAP2PLUS_TYPICAL
select I2C_OMAP
select MENELAUS if ARCH_OMAP2
select NEON if CPU_V7
- select PM_RUNTIME
+ select PM
select REGULATOR
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
Index: linux-pm/arch/sh/Kconfig
===================================================================
--- linux-pm.orig/arch/sh/Kconfig
+++ linux-pm/arch/sh/Kconfig
@@ -223,7 +223,7 @@ config CPU_SHX3
config ARCH_SHMOBILE
bool
select ARCH_SUSPEND_POSSIBLE
- select PM_RUNTIME
+ select PM
config CPU_HAS_PMU
depends on CPU_SH4 || CPU_SH4A
Index: linux-pm/drivers/usb/host/isp1760-hcd.c
===================================================================
--- linux-pm.orig/drivers/usb/host/isp1760-hcd.c
+++ linux-pm/drivers/usb/host/isp1760-hcd.c
@@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struc
int retval = 1;
unsigned long flags;
- /* if !PM_RUNTIME, root hub timers won't get shut down ... */
+ /* if !PM, root hub timers won't get shut down ... */
if (!HC_IS_RUNNING(hcd->state))
return 0;
Index: linux-pm/drivers/usb/host/oxu210hp-hcd.c
===================================================================
--- linux-pm.orig/drivers/usb/host/oxu210hp-hcd.c
+++ linux-pm/drivers/usb/host/oxu210hp-hcd.c
@@ -3087,7 +3087,7 @@ static int oxu_hub_status_data(struct us
int ports, i, retval = 1;
unsigned long flags;
- /* if !PM_RUNTIME, root hub timers won't get shut down ... */
+ /* if !PM, root hub timers won't get shut down ... */
if (!HC_IS_RUNNING(hcd->state))
return 0;
Index: linux-pm/include/linux/devfreq.h
===================================================================
--- linux-pm.orig/include/linux/devfreq.h
+++ linux-pm/include/linux/devfreq.h
@@ -188,7 +188,7 @@ extern struct devfreq *devm_devfreq_add_
extern void devm_devfreq_remove_device(struct device *dev,
struct devfreq *devfreq);
-/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
+/* Supposed to be called by PM callbacks */
extern int devfreq_suspend_device(struct devfreq *devfreq);
extern int devfreq_resume_device(struct devfreq *devfreq);
Index: linux-pm/kernel/power/Kconfig
===================================================================
--- linux-pm.orig/kernel/power/Kconfig
+++ linux-pm/kernel/power/Kconfig
@@ -94,7 +94,7 @@ config PM_STD_PARTITION
config PM_SLEEP
def_bool y
depends on SUSPEND || HIBERNATE_CALLBACKS
- select PM_RUNTIME
+ select PM
config PM_SLEEP_SMP
def_bool y
@@ -130,23 +130,19 @@ config PM_WAKELOCKS_GC
depends on PM_WAKELOCKS
default y
-config PM_RUNTIME
- bool "Run-time PM core functionality"
+config PM
+ bool "Device power management core functionality"
---help---
Enable functionality allowing I/O devices to be put into energy-saving
- (low power) states at run time (or autosuspended) after a specified
- period of inactivity and woken up in response to a hardware-generated
+ (low power) states, for example after a specified period of inactivity
+ (autosuspended), and woken up in response to a hardware-generated
wake-up event or a driver's request.
Hardware support is generally required for this functionality to work
and the bus type drivers of the buses the devices are on are
- responsible for the actual handling of the autosuspend requests and
+ responsible for the actual handling of device suspend requests and
wake-up events.
-config PM
- def_bool y
- depends on PM_SLEEP || PM_RUNTIME
-
config PM_DEBUG
bool "Power Management Debug Support"
depends on PM
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:57 ` Greg Kroah-Hartman
@ 2014-12-19 2:23 ` Rafael J. Wysocki
0 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 2:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Linux PM list, Linux Kernel Mailing List, Ulf Hansson,
Kevin Hilman, Jiri Slaby, Heikki Krogerus, linux-serial
On Thursday, December 18, 2014 05:57:17 PM Greg Kroah-Hartman wrote:
> On Fri, Dec 19, 2014 at 02:55:00AM +0100, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > The 8250_omap serial driver is a new user of CONFIG_PM_RUNTIME.
> >
> > However, 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 in 8250_omap.c.
> >
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > ---
> >
> > Please let me know if there are any objections against pushing this through
> > the linux-pm tree.
>
> Please do:
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Thanks!
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 2:03 ` [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME Rafael J. Wysocki
@ 2014-12-19 7:44 ` Ulf Hansson
2014-12-19 8:13 ` Geert Uytterhoeven
1 sibling, 0 replies; 14+ messages in thread
From: Ulf Hansson @ 2014-12-19 7:44 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Linux PM list, Linux Kernel Mailing List, Kevin Hilman,
Greg Kroah-Hartman, Simon Horman, Magnus Damm, Russell King,
Christian Daudt, Matt Porter, Kukjin Kim, Shawn Guo,
Sascha Hauer, Maxime Ripard, Stephen Warren, Thierry Reding,
Alexandre Courbot, Tony Lindgren, Ralf Baechle,
Benjamin Herrenschmidt, Mark Brown, Olof Johansson,
linux-arm-kernel, linux-usb, linux-samsung-soc
On 19 December 2014 at 03:03, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Having switched over all of the users of CONFIG_PM_RUNTIME to use
> CONFIG_PM directly, turn the latter into a user-selectable option
> and drop the former entirely from the tree.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
I am impressed , in this short period of time we managed to remove all
*PM_RUNTIME" configurations! Great work!
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
> arch/arm/configs/ape6evm_defconfig | 2 +-
> arch/arm/configs/armadillo800eva_defconfig | 2 +-
> arch/arm/configs/bcm_defconfig | 2 +-
> arch/arm/configs/bockw_defconfig | 2 +-
> arch/arm/configs/davinci_all_defconfig | 2 +-
> arch/arm/configs/exynos_defconfig | 2 +-
> arch/arm/configs/ezx_defconfig | 2 +-
> arch/arm/configs/hisi_defconfig | 2 +-
> arch/arm/configs/imote2_defconfig | 2 +-
> arch/arm/configs/imx_v6_v7_defconfig | 2 +-
> arch/arm/configs/keystone_defconfig | 2 +-
> arch/arm/configs/kzm9g_defconfig | 2 +-
> arch/arm/configs/lager_defconfig | 2 +-
> arch/arm/configs/mackerel_defconfig | 2 +-
> arch/arm/configs/marzen_defconfig | 2 +-
> arch/arm/configs/omap1_defconfig | 2 +-
> arch/arm/configs/prima2_defconfig | 2 +-
> arch/arm/configs/sama5_defconfig | 2 +-
> arch/arm/configs/shmobile_defconfig | 2 +-
> arch/arm/configs/sunxi_defconfig | 2 +-
> arch/arm/configs/tegra_defconfig | 2 +-
> arch/arm/configs/u8500_defconfig | 2 +-
> arch/arm/configs/vt8500_v6_v7_defconfig | 2 +-
> arch/arm/mach-omap2/Kconfig | 6 +++---
> arch/mips/configs/db1xxx_defconfig | 2 +-
> arch/mips/configs/lemote2f_defconfig | 2 +-
> arch/mips/configs/loongson3_defconfig | 2 +-
> arch/mips/configs/nlm_xlp_defconfig | 2 +-
> arch/mips/configs/nlm_xlr_defconfig | 2 +-
> arch/powerpc/configs/ps3_defconfig | 2 +-
> arch/sh/Kconfig | 2 +-
> arch/sh/configs/apsh4ad0a_defconfig | 2 +-
> arch/sh/configs/sdk7786_defconfig | 2 +-
> drivers/usb/host/isp1760-hcd.c | 2 +-
> drivers/usb/host/oxu210hp-hcd.c | 2 +-
> include/linux/devfreq.h | 2 +-
> kernel/power/Kconfig | 16 ++++++----------
> 37 files changed, 44 insertions(+), 48 deletions(-)
>
> Index: linux-pm/arch/arm/configs/ape6evm_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/ape6evm_defconfig
> +++ linux-pm/arch/arm/configs/ape6evm_defconfig
> @@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> CONFIG_BINFMT_MISC=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/armadillo800eva_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/armadillo800eva_defconfig
> +++ linux-pm/arch/arm/configs/armadillo800eva_defconfig
> @@ -43,7 +43,7 @@ CONFIG_KEXEC=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/bcm_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/bcm_defconfig
> +++ linux-pm/arch/arm/configs/bcm_defconfig
> @@ -39,7 +39,7 @@ CONFIG_CPU_IDLE=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_PACKET_DIAG=y
> Index: linux-pm/arch/arm/configs/bockw_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/bockw_defconfig
> +++ linux-pm/arch/arm/configs/bockw_defconfig
> @@ -29,7 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
> CONFIG_ARM_APPENDED_DTB=y
> CONFIG_VFP=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/davinci_all_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/davinci_all_defconfig
> +++ linux-pm/arch/arm/configs/davinci_all_defconfig
> @@ -49,7 +49,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
> CONFIG_CPU_FREQ_GOV_POWERSAVE=m
> CONFIG_CPU_FREQ_GOV_ONDEMAND=m
> CONFIG_CPU_IDLE=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/exynos_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/exynos_defconfig
> +++ linux-pm/arch/arm/configs/exynos_defconfig
> @@ -27,7 +27,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
> CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
> CONFIG_VFP=y
> CONFIG_NEON=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/ezx_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/ezx_defconfig
> +++ linux-pm/arch/arm/configs/ezx_defconfig
> @@ -39,7 +39,7 @@ CONFIG_BINFMT_AOUT=m
> CONFIG_BINFMT_MISC=m
> CONFIG_PM=y
> CONFIG_APM_EMULATION=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/hisi_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/hisi_defconfig
> +++ linux-pm/arch/arm/configs/hisi_defconfig
> @@ -18,7 +18,7 @@ CONFIG_ARM_APPENDED_DTB=y
> CONFIG_ARM_ATAG_DTB_COMPAT=y
> CONFIG_NEON=y
> CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/imote2_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/imote2_defconfig
> +++ linux-pm/arch/arm/configs/imote2_defconfig
> @@ -31,7 +31,7 @@ CONFIG_BINFMT_AOUT=m
> CONFIG_BINFMT_MISC=m
> CONFIG_PM=y
> CONFIG_APM_EMULATION=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/imx_v6_v7_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/imx_v6_v7_defconfig
> +++ linux-pm/arch/arm/configs/imx_v6_v7_defconfig
> @@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> CONFIG_BINFMT_MISC=m
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> CONFIG_PM_TEST_SUSPEND=y
> CONFIG_NET=y
> Index: linux-pm/arch/arm/configs/keystone_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/keystone_defconfig
> +++ linux-pm/arch/arm/configs/keystone_defconfig
> @@ -30,7 +30,7 @@ CONFIG_HIGHMEM=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> # CONFIG_SUSPEND is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/kzm9g_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/kzm9g_defconfig
> +++ linux-pm/arch/arm/configs/kzm9g_defconfig
> @@ -43,7 +43,7 @@ CONFIG_KEXEC=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/lager_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/lager_defconfig
> +++ linux-pm/arch/arm/configs/lager_defconfig
> @@ -37,7 +37,7 @@ CONFIG_AUTO_ZRELADDR=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/mackerel_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/mackerel_defconfig
> +++ linux-pm/arch/arm/configs/mackerel_defconfig
> @@ -28,7 +28,7 @@ CONFIG_KEXEC=y
> CONFIG_VFP=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> CONFIG_PM=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/marzen_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/marzen_defconfig
> +++ linux-pm/arch/arm/configs/marzen_defconfig
> @@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
> CONFIG_VFP=y
> CONFIG_KEXEC=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/omap1_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/omap1_defconfig
> +++ linux-pm/arch/arm/configs/omap1_defconfig
> @@ -63,7 +63,7 @@ CONFIG_FPE_NWFPE=y
> CONFIG_BINFMT_MISC=y
> CONFIG_PM=y
> # CONFIG_SUSPEND is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/prima2_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/prima2_defconfig
> +++ linux-pm/arch/arm/configs/prima2_defconfig
> @@ -18,7 +18,7 @@ CONFIG_PREEMPT=y
> CONFIG_AEABI=y
> CONFIG_KEXEC=y
> CONFIG_BINFMT_MISC=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
> CONFIG_BLK_DEV_LOOP=y
> CONFIG_BLK_DEV_RAM=y
> Index: linux-pm/arch/arm/configs/sama5_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/sama5_defconfig
> +++ linux-pm/arch/arm/configs/sama5_defconfig
> @@ -32,7 +32,7 @@ CONFIG_VFP=y
> CONFIG_NEON=y
> CONFIG_KERNEL_MODE_NEON=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> CONFIG_PM_ADVANCED_DEBUG=y
> CONFIG_NET=y
> Index: linux-pm/arch/arm/configs/shmobile_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/shmobile_defconfig
> +++ linux-pm/arch/arm/configs/shmobile_defconfig
> @@ -39,7 +39,7 @@ CONFIG_KEXEC=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/sunxi_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/sunxi_defconfig
> +++ linux-pm/arch/arm/configs/sunxi_defconfig
> @@ -11,7 +11,7 @@ CONFIG_ARM_APPENDED_DTB=y
> CONFIG_ARM_ATAG_DTB_COMPAT=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/tegra_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/tegra_defconfig
> +++ linux-pm/arch/arm/configs/tegra_defconfig
> @@ -46,7 +46,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
> CONFIG_CPU_IDLE=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/u8500_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/u8500_defconfig
> +++ linux-pm/arch/arm/configs/u8500_defconfig
> @@ -25,7 +25,7 @@ CONFIG_CPU_IDLE=y
> CONFIG_ARM_U8500_CPUIDLE=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/arm/configs/vt8500_v6_v7_defconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/configs/vt8500_v6_v7_defconfig
> +++ linux-pm/arch/arm/configs/vt8500_v6_v7_defconfig
> @@ -16,7 +16,7 @@ CONFIG_ARM_APPENDED_DTB=y
> CONFIG_ARM_ATAG_DTB_COMPAT=y
> CONFIG_VFP=y
> CONFIG_NEON=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_UNIX=y
> CONFIG_INET=y
> Index: linux-pm/arch/mips/configs/db1xxx_defconfig
> ===================================================================
> --- linux-pm.orig/arch/mips/configs/db1xxx_defconfig
> +++ linux-pm/arch/mips/configs/db1xxx_defconfig
> @@ -36,7 +36,7 @@ CONFIG_PCI=y
> CONFIG_PCI_REALLOC_ENABLE_AUTO=y
> CONFIG_PCCARD=y
> CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_PACKET_DIAG=y
> Index: linux-pm/arch/mips/configs/lemote2f_defconfig
> ===================================================================
> --- linux-pm.orig/arch/mips/configs/lemote2f_defconfig
> +++ linux-pm/arch/mips/configs/lemote2f_defconfig
> @@ -37,7 +37,7 @@ CONFIG_MIPS32_N32=y
> CONFIG_PM=y
> CONFIG_HIBERNATION=y
> CONFIG_PM_STD_PARTITION="/dev/hda3"
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_CPU_FREQ=y
> CONFIG_CPU_FREQ_DEBUG=y
> CONFIG_CPU_FREQ_STAT=m
> Index: linux-pm/arch/mips/configs/loongson3_defconfig
> ===================================================================
> --- linux-pm.orig/arch/mips/configs/loongson3_defconfig
> +++ linux-pm/arch/mips/configs/loongson3_defconfig
> @@ -58,7 +58,7 @@ CONFIG_BINFMT_MISC=m
> CONFIG_MIPS32_COMPAT=y
> CONFIG_MIPS32_O32=y
> CONFIG_MIPS32_N32=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> Index: linux-pm/arch/mips/configs/nlm_xlp_defconfig
> ===================================================================
> --- linux-pm.orig/arch/mips/configs/nlm_xlp_defconfig
> +++ linux-pm/arch/mips/configs/nlm_xlp_defconfig
> @@ -61,7 +61,7 @@ CONFIG_BINFMT_MISC=y
> CONFIG_MIPS32_COMPAT=y
> CONFIG_MIPS32_O32=y
> CONFIG_MIPS32_N32=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> Index: linux-pm/arch/mips/configs/nlm_xlr_defconfig
> ===================================================================
> --- linux-pm.orig/arch/mips/configs/nlm_xlr_defconfig
> +++ linux-pm/arch/mips/configs/nlm_xlr_defconfig
> @@ -41,7 +41,7 @@ CONFIG_PCI=y
> CONFIG_PCI_MSI=y
> CONFIG_PCI_DEBUG=y
> CONFIG_BINFMT_MISC=m
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> Index: linux-pm/arch/powerpc/configs/ps3_defconfig
> ===================================================================
> --- linux-pm.orig/arch/powerpc/configs/ps3_defconfig
> +++ linux-pm/arch/powerpc/configs/ps3_defconfig
> @@ -36,7 +36,7 @@ CONFIG_KEXEC=y
> CONFIG_SCHED_SMT=y
> CONFIG_CMDLINE_BOOL=y
> CONFIG_CMDLINE=""
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> # CONFIG_SECCOMP is not set
> # CONFIG_PCI is not set
> Index: linux-pm/arch/sh/configs/apsh4ad0a_defconfig
> ===================================================================
> --- linux-pm.orig/arch/sh/configs/apsh4ad0a_defconfig
> +++ linux-pm/arch/sh/configs/apsh4ad0a_defconfig
> @@ -47,7 +47,7 @@ CONFIG_PREEMPT=y
> CONFIG_BINFMT_MISC=y
> CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_CPU_IDLE=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> Index: linux-pm/arch/sh/configs/sdk7786_defconfig
> ===================================================================
> --- linux-pm.orig/arch/sh/configs/sdk7786_defconfig
> +++ linux-pm/arch/sh/configs/sdk7786_defconfig
> @@ -82,7 +82,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
> CONFIG_BINFMT_MISC=y
> CONFIG_PM=y
> CONFIG_PM_DEBUG=y
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
> CONFIG_CPU_IDLE=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> Index: linux-pm/arch/arm/mach-omap2/Kconfig
> ===================================================================
> --- linux-pm.orig/arch/arm/mach-omap2/Kconfig
> +++ linux-pm/arch/arm/mach-omap2/Kconfig
> @@ -15,7 +15,7 @@ config ARCH_OMAP3
> select ARM_CPU_SUSPEND if PM
> select OMAP_INTERCONNECT
> select PM_OPP if PM
> - select PM_RUNTIME if CPU_IDLE
> + select PM if CPU_IDLE
> select SOC_HAS_OMAP2_SDRC
>
> config ARCH_OMAP4
> @@ -32,7 +32,7 @@ config ARCH_OMAP4
> select PL310_ERRATA_588369 if CACHE_L2X0
> select PL310_ERRATA_727915 if CACHE_L2X0
> select PM_OPP if PM
> - select PM_RUNTIME if CPU_IDLE
> + select PM if CPU_IDLE
> select ARM_ERRATA_754322
> select ARM_ERRATA_775420
>
> @@ -103,7 +103,7 @@ config ARCH_OMAP2PLUS_TYPICAL
> select I2C_OMAP
> select MENELAUS if ARCH_OMAP2
> select NEON if CPU_V7
> - select PM_RUNTIME
> + select PM
> select REGULATOR
> select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
> select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
> Index: linux-pm/arch/sh/Kconfig
> ===================================================================
> --- linux-pm.orig/arch/sh/Kconfig
> +++ linux-pm/arch/sh/Kconfig
> @@ -223,7 +223,7 @@ config CPU_SHX3
> config ARCH_SHMOBILE
> bool
> select ARCH_SUSPEND_POSSIBLE
> - select PM_RUNTIME
> + select PM
>
> config CPU_HAS_PMU
> depends on CPU_SH4 || CPU_SH4A
> Index: linux-pm/drivers/usb/host/isp1760-hcd.c
> ===================================================================
> --- linux-pm.orig/drivers/usb/host/isp1760-hcd.c
> +++ linux-pm/drivers/usb/host/isp1760-hcd.c
> @@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struc
> int retval = 1;
> unsigned long flags;
>
> - /* if !PM_RUNTIME, root hub timers won't get shut down ... */
> + /* if !PM, root hub timers won't get shut down ... */
> if (!HC_IS_RUNNING(hcd->state))
> return 0;
>
> Index: linux-pm/drivers/usb/host/oxu210hp-hcd.c
> ===================================================================
> --- linux-pm.orig/drivers/usb/host/oxu210hp-hcd.c
> +++ linux-pm/drivers/usb/host/oxu210hp-hcd.c
> @@ -3087,7 +3087,7 @@ static int oxu_hub_status_data(struct us
> int ports, i, retval = 1;
> unsigned long flags;
>
> - /* if !PM_RUNTIME, root hub timers won't get shut down ... */
> + /* if !PM, root hub timers won't get shut down ... */
> if (!HC_IS_RUNNING(hcd->state))
> return 0;
>
> Index: linux-pm/include/linux/devfreq.h
> ===================================================================
> --- linux-pm.orig/include/linux/devfreq.h
> +++ linux-pm/include/linux/devfreq.h
> @@ -188,7 +188,7 @@ extern struct devfreq *devm_devfreq_add_
> extern void devm_devfreq_remove_device(struct device *dev,
> struct devfreq *devfreq);
>
> -/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
> +/* Supposed to be called by PM callbacks */
> extern int devfreq_suspend_device(struct devfreq *devfreq);
> extern int devfreq_resume_device(struct devfreq *devfreq);
>
> Index: linux-pm/kernel/power/Kconfig
> ===================================================================
> --- linux-pm.orig/kernel/power/Kconfig
> +++ linux-pm/kernel/power/Kconfig
> @@ -94,7 +94,7 @@ config PM_STD_PARTITION
> config PM_SLEEP
> def_bool y
> depends on SUSPEND || HIBERNATE_CALLBACKS
> - select PM_RUNTIME
> + select PM
>
> config PM_SLEEP_SMP
> def_bool y
> @@ -130,23 +130,19 @@ config PM_WAKELOCKS_GC
> depends on PM_WAKELOCKS
> default y
>
> -config PM_RUNTIME
> - bool "Run-time PM core functionality"
> +config PM
> + bool "Device power management core functionality"
> ---help---
> Enable functionality allowing I/O devices to be put into energy-saving
> - (low power) states at run time (or autosuspended) after a specified
> - period of inactivity and woken up in response to a hardware-generated
> + (low power) states, for example after a specified period of inactivity
> + (autosuspended), and woken up in response to a hardware-generated
> wake-up event or a driver's request.
>
> Hardware support is generally required for this functionality to work
> and the bus type drivers of the buses the devices are on are
> - responsible for the actual handling of the autosuspend requests and
> + responsible for the actual handling of device suspend requests and
> wake-up events.
>
> -config PM
> - def_bool y
> - depends on PM_SLEEP || PM_RUNTIME
> -
> config PM_DEBUG
> bool "Power Management Debug Support"
> depends on PM
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 2:03 ` [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19 7:44 ` Ulf Hansson
@ 2014-12-19 8:13 ` Geert Uytterhoeven
2014-12-19 21:41 ` Rafael J. Wysocki
1 sibling, 1 reply; 14+ messages in thread
From: Geert Uytterhoeven @ 2014-12-19 8:13 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Linux PM list, Linux Kernel Mailing List, Ulf Hansson,
Kevin Hilman, Greg Kroah-Hartman, Simon Horman, Magnus Damm,
Russell King, Christian Daudt, Matt Porter, Kukjin Kim,
Shawn Guo, Sascha Hauer, Maxime Ripard, Stephen Warren,
Thierry Reding, Alexandre Courbot, Tony Lindgren, Ralf Baechle,
Benjamin Herrenschmidt, Mark Brown, Olof Johansson,
linux-arm-kernel, USB list, linux-samsung-soc
On Fri, Dec 19, 2014 at 3:03 AM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> --- linux-pm.orig/arch/mips/configs/lemote2f_defconfig
> +++ linux-pm/arch/mips/configs/lemote2f_defconfig
> @@ -37,7 +37,7 @@ CONFIG_MIPS32_N32=y
> CONFIG_PM=y
^^^^^^^^^^^
> CONFIG_HIBERNATION=y
> CONFIG_PM_STD_PARTITION="/dev/hda3"
> -CONFIG_PM_RUNTIME=y
> +CONFIG_PM=y
^^^^^^^^^^^
Now we have two of them
> CONFIG_CPU_FREQ=y
> CONFIG_CPU_FREQ_DEBUG=y
> CONFIG_CPU_FREQ_STAT=m
Other defconfig files may be affected, too.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:49 ` [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
@ 2014-12-19 11:39 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2014-12-19 11:39 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Linux PM list, Linux Kernel Mailing List, Ulf Hansson,
Kevin Hilman, linux-spi
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
On Fri, Dec 19, 2014 at 02:49:26AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> A couple of new CONFIG_PM_RUNTIME users have been added recently
> in the SPI subsystem.
Acked-by: Mark Brown <broonie@kernel.org>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/4] sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 1:51 ` [PATCH 2/4] sound: sst-haswell-pcm: " Rafael J. Wysocki
@ 2014-12-19 11:41 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2014-12-19 11:41 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Linux PM list, Linux Kernel Mailing List, Ulf Hansson,
Kevin Hilman, Liam Girdwood, Takashi Iwai
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
On Fri, Dec 19, 2014 at 02:51:38AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> The sst-haswell-pcm driver is a new user of CONFIG_PM_RUNTIME.
>
> However, 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.
If you're going to apply this please fix the subject line to use the
style appropriate for the subsystem (ASoC:). With that...
Acked-by: Mark Brown <broonie@kernel.org>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 8:13 ` Geert Uytterhoeven
@ 2014-12-19 21:41 ` Rafael J. Wysocki
2014-12-19 21:49 ` Kevin Hilman
0 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 21:41 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Linux PM list, Linux Kernel Mailing List, Ulf Hansson,
Kevin Hilman, Greg Kroah-Hartman, Simon Horman, Magnus Damm,
Russell King, Christian Daudt, Matt Porter, Kukjin Kim,
Shawn Guo, Sascha Hauer, Maxime Ripard, Stephen Warren,
Thierry Reding, Alexandre Courbot, Tony Lindgren, Ralf Baechle,
Benjamin Herrenschmidt, Mark Brown, Olof Johansson,
linux-arm-kernel, USB list, linux-samsung-soc
On Friday, December 19, 2014 09:13:29 AM Geert Uytterhoeven wrote:
> On Fri, Dec 19, 2014 at 3:03 AM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> > --- linux-pm.orig/arch/mips/configs/lemote2f_defconfig
> > +++ linux-pm/arch/mips/configs/lemote2f_defconfig
> > @@ -37,7 +37,7 @@ CONFIG_MIPS32_N32=y
> > CONFIG_PM=y
> ^^^^^^^^^^^
> > CONFIG_HIBERNATION=y
> > CONFIG_PM_STD_PARTITION="/dev/hda3"
> > -CONFIG_PM_RUNTIME=y
> > +CONFIG_PM=y
> ^^^^^^^^^^^
> Now we have two of them
>
> > CONFIG_CPU_FREQ=y
> > CONFIG_CPU_FREQ_DEBUG=y
> > CONFIG_CPU_FREQ_STAT=m
>
> Other defconfig files may be affected, too.
Good catch, I felt I might have forgotten about something ...
Fixed up patch is appended, thanks!
---
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: PM: Eliminate CONFIG_PM_RUNTIME
Having switched over all of the users of CONFIG_PM_RUNTIME to use
CONFIG_PM directly, turn the latter into a user-selectable option
and drop the former entirely from the tree.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
---
arch/arm/configs/ape6evm_defconfig | 2 +-
arch/arm/configs/armadillo800eva_defconfig | 2 +-
arch/arm/configs/bcm_defconfig | 2 +-
arch/arm/configs/bockw_defconfig | 2 +-
arch/arm/configs/davinci_all_defconfig | 2 +-
arch/arm/configs/exynos_defconfig | 2 +-
arch/arm/configs/ezx_defconfig | 1 -
arch/arm/configs/hisi_defconfig | 2 +-
arch/arm/configs/imote2_defconfig | 1 -
arch/arm/configs/imx_v6_v7_defconfig | 2 +-
arch/arm/configs/keystone_defconfig | 2 +-
arch/arm/configs/kzm9g_defconfig | 2 +-
arch/arm/configs/lager_defconfig | 2 +-
arch/arm/configs/mackerel_defconfig | 1 -
arch/arm/configs/marzen_defconfig | 2 +-
arch/arm/configs/omap1_defconfig | 1 -
arch/arm/configs/prima2_defconfig | 2 +-
arch/arm/configs/sama5_defconfig | 2 +-
arch/arm/configs/shmobile_defconfig | 2 +-
arch/arm/configs/sunxi_defconfig | 2 +-
arch/arm/configs/tegra_defconfig | 2 +-
arch/arm/configs/u8500_defconfig | 2 +-
arch/arm/configs/vt8500_v6_v7_defconfig | 2 +-
arch/arm/mach-omap2/Kconfig | 6 +++---
arch/mips/configs/db1xxx_defconfig | 2 +-
arch/mips/configs/lemote2f_defconfig | 1 -
arch/mips/configs/loongson3_defconfig | 2 +-
arch/mips/configs/nlm_xlp_defconfig | 2 +-
arch/mips/configs/nlm_xlr_defconfig | 2 +-
arch/powerpc/configs/ps3_defconfig | 2 +-
arch/sh/Kconfig | 2 +-
arch/sh/configs/apsh4ad0a_defconfig | 2 +-
arch/sh/configs/sdk7786_defconfig | 2 +-
drivers/usb/host/isp1760-hcd.c | 2 +-
drivers/usb/host/oxu210hp-hcd.c | 2 +-
include/linux/devfreq.h | 2 +-
kernel/power/Kconfig | 16 ++++++----------
37 files changed, 39 insertions(+), 48 deletions(-)
Index: linux-pm/arch/arm/configs/ape6evm_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/ape6evm_defconfig
+++ linux-pm/arch/arm/configs/ape6evm_defconfig
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/armadillo800eva_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/armadillo800eva_defconfig
+++ linux-pm/arch/arm/configs/armadillo800eva_defconfig
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/bcm_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/bcm_defconfig
+++ linux-pm/arch/arm/configs/bcm_defconfig
@@ -39,7 +39,7 @@ CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=y
Index: linux-pm/arch/arm/configs/bockw_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/bockw_defconfig
+++ linux-pm/arch/arm/configs/bockw_defconfig
@@ -29,7 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/davinci_all_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/davinci_all_defconfig
+++ linux-pm/arch/arm/configs/davinci_all_defconfig
@@ -49,7 +49,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_IDLE=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/exynos_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/exynos_defconfig
+++ linux-pm/arch/arm/configs/exynos_defconfig
@@ -27,7 +27,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/ezx_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/ezx_defconfig
+++ linux-pm/arch/arm/configs/ezx_defconfig
@@ -39,7 +39,6 @@ CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
CONFIG_PM=y
CONFIG_APM_EMULATION=y
-CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/hisi_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/hisi_defconfig
+++ linux-pm/arch/arm/configs/hisi_defconfig
@@ -18,7 +18,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_NEON=y
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/imote2_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/imote2_defconfig
+++ linux-pm/arch/arm/configs/imote2_defconfig
@@ -31,7 +31,6 @@ CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
CONFIG_PM=y
CONFIG_APM_EMULATION=y
-CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/imx_v6_v7_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/imx_v6_v7_defconfig
+++ linux-pm/arch/arm/configs/imx_v6_v7_defconfig
@@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
CONFIG_NET=y
Index: linux-pm/arch/arm/configs/keystone_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/keystone_defconfig
+++ linux-pm/arch/arm/configs/keystone_defconfig
@@ -30,7 +30,7 @@ CONFIG_HIGHMEM=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_SUSPEND is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/kzm9g_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/kzm9g_defconfig
+++ linux-pm/arch/arm/configs/kzm9g_defconfig
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/lager_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/lager_defconfig
+++ linux-pm/arch/arm/configs/lager_defconfig
@@ -37,7 +37,7 @@ CONFIG_AUTO_ZRELADDR=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/mackerel_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/mackerel_defconfig
+++ linux-pm/arch/arm/configs/mackerel_defconfig
@@ -28,7 +28,6 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/marzen_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/marzen_defconfig
+++ linux-pm/arch/arm/configs/marzen_defconfig
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
CONFIG_KEXEC=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/omap1_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/omap1_defconfig
+++ linux-pm/arch/arm/configs/omap1_defconfig
@@ -63,7 +63,6 @@ CONFIG_FPE_NWFPE=y
CONFIG_BINFMT_MISC=y
CONFIG_PM=y
# CONFIG_SUSPEND is not set
-CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/prima2_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/prima2_defconfig
+++ linux-pm/arch/arm/configs/prima2_defconfig
@@ -18,7 +18,7 @@ CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_KEXEC=y
CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
Index: linux-pm/arch/arm/configs/sama5_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/sama5_defconfig
+++ linux-pm/arch/arm/configs/sama5_defconfig
@@ -32,7 +32,7 @@ CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_KERNEL_MODE_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_NET=y
Index: linux-pm/arch/arm/configs/shmobile_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/shmobile_defconfig
+++ linux-pm/arch/arm/configs/shmobile_defconfig
@@ -39,7 +39,7 @@ CONFIG_KEXEC=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/sunxi_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/sunxi_defconfig
+++ linux-pm/arch/arm/configs/sunxi_defconfig
@@ -11,7 +11,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/tegra_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/tegra_defconfig
+++ linux-pm/arch/arm/configs/tegra_defconfig
@@ -46,7 +46,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/u8500_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/u8500_defconfig
+++ linux-pm/arch/arm/configs/u8500_defconfig
@@ -25,7 +25,7 @@ CONFIG_CPU_IDLE=y
CONFIG_ARM_U8500_CPUIDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/arm/configs/vt8500_v6_v7_defconfig
===================================================================
--- linux-pm.orig/arch/arm/configs/vt8500_v6_v7_defconfig
+++ linux-pm/arch/arm/configs/vt8500_v6_v7_defconfig
@@ -16,7 +16,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_UNIX=y
CONFIG_INET=y
Index: linux-pm/arch/mips/configs/db1xxx_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/db1xxx_defconfig
+++ linux-pm/arch/mips/configs/db1xxx_defconfig
@@ -36,7 +36,7 @@ CONFIG_PCI=y
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
CONFIG_PCCARD=y
CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=y
Index: linux-pm/arch/mips/configs/lemote2f_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/lemote2f_defconfig
+++ linux-pm/arch/mips/configs/lemote2f_defconfig
@@ -37,7 +37,6 @@ CONFIG_MIPS32_N32=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION="/dev/hda3"
-CONFIG_PM_RUNTIME=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=m
Index: linux-pm/arch/mips/configs/loongson3_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/loongson3_defconfig
+++ linux-pm/arch/mips/configs/loongson3_defconfig
@@ -58,7 +58,7 @@ CONFIG_BINFMT_MISC=m
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
Index: linux-pm/arch/mips/configs/nlm_xlp_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/nlm_xlp_defconfig
+++ linux-pm/arch/mips/configs/nlm_xlp_defconfig
@@ -61,7 +61,7 @@ CONFIG_BINFMT_MISC=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/mips/configs/nlm_xlr_defconfig
===================================================================
--- linux-pm.orig/arch/mips/configs/nlm_xlr_defconfig
+++ linux-pm/arch/mips/configs/nlm_xlr_defconfig
@@ -41,7 +41,7 @@ CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_DEBUG=y
CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/powerpc/configs/ps3_defconfig
===================================================================
--- linux-pm.orig/arch/powerpc/configs/ps3_defconfig
+++ linux-pm/arch/powerpc/configs/ps3_defconfig
@@ -36,7 +36,7 @@ CONFIG_KEXEC=y
CONFIG_SCHED_SMT=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE=""
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
# CONFIG_SECCOMP is not set
# CONFIG_PCI is not set
Index: linux-pm/arch/sh/configs/apsh4ad0a_defconfig
===================================================================
--- linux-pm.orig/arch/sh/configs/apsh4ad0a_defconfig
+++ linux-pm/arch/sh/configs/apsh4ad0a_defconfig
@@ -47,7 +47,7 @@ CONFIG_PREEMPT=y
CONFIG_BINFMT_MISC=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_CPU_IDLE=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/sh/configs/sdk7786_defconfig
===================================================================
--- linux-pm.orig/arch/sh/configs/sdk7786_defconfig
+++ linux-pm/arch/sh/configs/sdk7786_defconfig
@@ -82,7 +82,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_MISC=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_CPU_IDLE=y
CONFIG_NET=y
CONFIG_PACKET=y
Index: linux-pm/arch/arm/mach-omap2/Kconfig
===================================================================
--- linux-pm.orig/arch/arm/mach-omap2/Kconfig
+++ linux-pm/arch/arm/mach-omap2/Kconfig
@@ -15,7 +15,7 @@ config ARCH_OMAP3
select ARM_CPU_SUSPEND if PM
select OMAP_INTERCONNECT
select PM_OPP if PM
- select PM_RUNTIME if CPU_IDLE
+ select PM if CPU_IDLE
select SOC_HAS_OMAP2_SDRC
config ARCH_OMAP4
@@ -32,7 +32,7 @@ config ARCH_OMAP4
select PL310_ERRATA_588369 if CACHE_L2X0
select PL310_ERRATA_727915 if CACHE_L2X0
select PM_OPP if PM
- select PM_RUNTIME if CPU_IDLE
+ select PM if CPU_IDLE
select ARM_ERRATA_754322
select ARM_ERRATA_775420
@@ -103,7 +103,7 @@ config ARCH_OMAP2PLUS_TYPICAL
select I2C_OMAP
select MENELAUS if ARCH_OMAP2
select NEON if CPU_V7
- select PM_RUNTIME
+ select PM
select REGULATOR
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
Index: linux-pm/arch/sh/Kconfig
===================================================================
--- linux-pm.orig/arch/sh/Kconfig
+++ linux-pm/arch/sh/Kconfig
@@ -223,7 +223,7 @@ config CPU_SHX3
config ARCH_SHMOBILE
bool
select ARCH_SUSPEND_POSSIBLE
- select PM_RUNTIME
+ select PM
config CPU_HAS_PMU
depends on CPU_SH4 || CPU_SH4A
Index: linux-pm/drivers/usb/host/isp1760-hcd.c
===================================================================
--- linux-pm.orig/drivers/usb/host/isp1760-hcd.c
+++ linux-pm/drivers/usb/host/isp1760-hcd.c
@@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struc
int retval = 1;
unsigned long flags;
- /* if !PM_RUNTIME, root hub timers won't get shut down ... */
+ /* if !PM, root hub timers won't get shut down ... */
if (!HC_IS_RUNNING(hcd->state))
return 0;
Index: linux-pm/drivers/usb/host/oxu210hp-hcd.c
===================================================================
--- linux-pm.orig/drivers/usb/host/oxu210hp-hcd.c
+++ linux-pm/drivers/usb/host/oxu210hp-hcd.c
@@ -3087,7 +3087,7 @@ static int oxu_hub_status_data(struct us
int ports, i, retval = 1;
unsigned long flags;
- /* if !PM_RUNTIME, root hub timers won't get shut down ... */
+ /* if !PM, root hub timers won't get shut down ... */
if (!HC_IS_RUNNING(hcd->state))
return 0;
Index: linux-pm/include/linux/devfreq.h
===================================================================
--- linux-pm.orig/include/linux/devfreq.h
+++ linux-pm/include/linux/devfreq.h
@@ -188,7 +188,7 @@ extern struct devfreq *devm_devfreq_add_
extern void devm_devfreq_remove_device(struct device *dev,
struct devfreq *devfreq);
-/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
+/* Supposed to be called by PM callbacks */
extern int devfreq_suspend_device(struct devfreq *devfreq);
extern int devfreq_resume_device(struct devfreq *devfreq);
Index: linux-pm/kernel/power/Kconfig
===================================================================
--- linux-pm.orig/kernel/power/Kconfig
+++ linux-pm/kernel/power/Kconfig
@@ -94,7 +94,7 @@ config PM_STD_PARTITION
config PM_SLEEP
def_bool y
depends on SUSPEND || HIBERNATE_CALLBACKS
- select PM_RUNTIME
+ select PM
config PM_SLEEP_SMP
def_bool y
@@ -130,23 +130,19 @@ config PM_WAKELOCKS_GC
depends on PM_WAKELOCKS
default y
-config PM_RUNTIME
- bool "Run-time PM core functionality"
+config PM
+ bool "Device power management core functionality"
---help---
Enable functionality allowing I/O devices to be put into energy-saving
- (low power) states at run time (or autosuspended) after a specified
- period of inactivity and woken up in response to a hardware-generated
+ (low power) states, for example after a specified period of inactivity
+ (autosuspended), and woken up in response to a hardware-generated
wake-up event or a driver's request.
Hardware support is generally required for this functionality to work
and the bus type drivers of the buses the devices are on are
- responsible for the actual handling of the autosuspend requests and
+ responsible for the actual handling of device suspend requests and
wake-up events.
-config PM
- def_bool y
- depends on PM_SLEEP || PM_RUNTIME
-
config PM_DEBUG
bool "Power Management Debug Support"
depends on PM
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 21:41 ` Rafael J. Wysocki
@ 2014-12-19 21:49 ` Kevin Hilman
2014-12-19 22:25 ` Rafael J. Wysocki
0 siblings, 1 reply; 14+ messages in thread
From: Kevin Hilman @ 2014-12-19 21:49 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Geert Uytterhoeven, Linux PM list, Linux Kernel Mailing List,
Ulf Hansson, Greg Kroah-Hartman, Simon Horman, Magnus Damm,
Russell King, Christian Daudt, Matt Porter, Kukjin Kim,
Shawn Guo, Sascha Hauer, Maxime Ripard, Stephen Warren,
Thierry Reding, Alexandre Courbot, Tony Lindgren, Ralf Baechle,
Benjamin Herrenschmidt, Mark Brown, Olof Johansson,
linux-arm-kernel, USB list, lin ux-samsung-soc@vger.kernel.org
"Rafael J. Wysocki" <rjw@rjwysocki.net> writes:
[...]
> Fixed up patch is appended, thanks!
>
>
> ---
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: PM: Eliminate CONFIG_PM_RUNTIME
>
> Having switched over all of the users of CONFIG_PM_RUNTIME to use
> CONFIG_PM directly, turn the latter into a user-selectable option
> and drop the former entirely from the tree.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
I assume you're planning to get this in early in the v3.19-rc cycle,
correct? That way we can hopefully avoid conflicts with the various
defconfig changes we're taking through the arm-soc tree.
Also, thanks for taking care of all the tree-wide changes. This is a
great change.
Kevin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 21:49 ` Kevin Hilman
@ 2014-12-19 22:25 ` Rafael J. Wysocki
0 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2014-12-19 22:25 UTC (permalink / raw)
To: Kevin Hilman
Cc: Geert Uytterhoeven, Linux PM list, Linux Kernel Mailing List,
Ulf Hansson, Greg Kroah-Hartman, Simon Horman, Magnus Damm,
Russell King, Christian Daudt, Matt Porter, Kukjin Kim,
Shawn Guo, Sascha Hauer, Maxime Ripard, Stephen Warren,
Thierry Reding, Alexandre Courbot, Tony Lindgren, Ralf Baechle,
Benjamin Herrenschmidt, Mark Brown, Olof Johansson,
linux-arm-kernel, USB list, lin ux-samsung-soc@vger.kernel.org
On Friday, December 19, 2014 01:49:34 PM Kevin Hilman wrote:
> "Rafael J. Wysocki" <rjw@rjwysocki.net> writes:
>
> [...]
>
> > Fixed up patch is appended, thanks!
> >
> >
> > ---
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Subject: PM: Eliminate CONFIG_PM_RUNTIME
> >
> > Having switched over all of the users of CONFIG_PM_RUNTIME to use
> > CONFIG_PM directly, turn the latter into a user-selectable option
> > and drop the former entirely from the tree.
> >
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
>
> Acked-by: Kevin Hilman <khilman@linaro.org>
>
> I assume you're planning to get this in early in the v3.19-rc cycle,
> correct? That way we can hopefully avoid conflicts with the various
> defconfig changes we're taking through the arm-soc tree.
I'm going to send a pull request with these changes tomorrow.
> Also, thanks for taking care of all the tree-wide changes. This is a
> great change.
Thanks!
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-12-19 22:04 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-19 1:42 [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19 1:49 ` [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-19 11:39 ` Mark Brown
2014-12-19 1:51 ` [PATCH 2/4] sound: sst-haswell-pcm: " Rafael J. Wysocki
2014-12-19 11:41 ` Mark Brown
2014-12-19 1:55 ` [PATCH 3/4] tty: 8250_omap: " Rafael J. Wysocki
2014-12-19 1:57 ` Greg Kroah-Hartman
2014-12-19 2:23 ` Rafael J. Wysocki
2014-12-19 2:03 ` [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19 7:44 ` Ulf Hansson
2014-12-19 8:13 ` Geert Uytterhoeven
2014-12-19 21:41 ` Rafael J. Wysocki
2014-12-19 21:49 ` Kevin Hilman
2014-12-19 22:25 ` Rafael J. Wysocki
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).