Skip to content

Commit 464ed18

Browse files
rafaeljwrafaeljw
committed
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>
1 parent 71504e5 commit 464ed18

37 files changed

+39
-48
lines changed

‎arch/arm/configs/ape6evm_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
3333
CONFIG_VFP=y
3434
CONFIG_NEON=y
3535
CONFIG_BINFMT_MISC=y
36-
CONFIG_PM_RUNTIME=y
36+
CONFIG_PM=y
3737
CONFIG_NET=y
3838
CONFIG_PACKET=y
3939
CONFIG_UNIX=y

‎arch/arm/configs/armadillo800eva_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y
4343
CONFIG_VFP=y
4444
CONFIG_NEON=y
4545
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46-
CONFIG_PM_RUNTIME=y
46+
CONFIG_PM=y
4747
CONFIG_NET=y
4848
CONFIG_PACKET=y
4949
CONFIG_UNIX=y

‎arch/arm/configs/bcm_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONFIG_CPU_IDLE=y
3939
CONFIG_VFP=y
4040
CONFIG_NEON=y
4141
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42-
CONFIG_PM_RUNTIME=y
42+
CONFIG_PM=y
4343
CONFIG_NET=y
4444
CONFIG_PACKET=y
4545
CONFIG_PACKET_DIAG=y

‎arch/arm/configs/bockw_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
2929
CONFIG_ARM_APPENDED_DTB=y
3030
CONFIG_VFP=y
3131
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32-
CONFIG_PM_RUNTIME=y
32+
CONFIG_PM=y
3333
CONFIG_NET=y
3434
CONFIG_PACKET=y
3535
CONFIG_UNIX=y

‎arch/arm/configs/davinci_all_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
4949
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
5050
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
5151
CONFIG_CPU_IDLE=y
52-
CONFIG_PM_RUNTIME=y
52+
CONFIG_PM=y
5353
CONFIG_NET=y
5454
CONFIG_PACKET=y
5555
CONFIG_UNIX=y

‎arch/arm/configs/exynos_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
2727
CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
2828
CONFIG_VFP=y
2929
CONFIG_NEON=y
30-
CONFIG_PM_RUNTIME=y
30+
CONFIG_PM=y
3131
CONFIG_NET=y
3232
CONFIG_PACKET=y
3333
CONFIG_UNIX=y

‎arch/arm/configs/ezx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ CONFIG_BINFMT_AOUT=m
3939
CONFIG_BINFMT_MISC=m
4040
CONFIG_PM=y
4141
CONFIG_APM_EMULATION=y
42-
CONFIG_PM_RUNTIME=y
4342
CONFIG_NET=y
4443
CONFIG_PACKET=y
4544
CONFIG_UNIX=y

‎arch/arm/configs/hisi_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CONFIG_ARM_APPENDED_DTB=y
1818
CONFIG_ARM_ATAG_DTB_COMPAT=y
1919
CONFIG_NEON=y
2020
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
21-
CONFIG_PM_RUNTIME=y
21+
CONFIG_PM=y
2222
CONFIG_NET=y
2323
CONFIG_PACKET=y
2424
CONFIG_UNIX=y

‎arch/arm/configs/imote2_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CONFIG_BINFMT_AOUT=m
3131
CONFIG_BINFMT_MISC=m
3232
CONFIG_PM=y
3333
CONFIG_APM_EMULATION=y
34-
CONFIG_PM_RUNTIME=y
3534
CONFIG_NET=y
3635
CONFIG_PACKET=y
3736
CONFIG_UNIX=y

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y
5454
CONFIG_VFP=y
5555
CONFIG_NEON=y
5656
CONFIG_BINFMT_MISC=m
57-
CONFIG_PM_RUNTIME=y
57+
CONFIG_PM=y
5858
CONFIG_PM_DEBUG=y
5959
CONFIG_PM_TEST_SUSPEND=y
6060
CONFIG_NET=y

‎arch/arm/configs/keystone_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CONFIG_HIGHMEM=y
3030
CONFIG_VFP=y
3131
CONFIG_NEON=y
3232
# CONFIG_SUSPEND is not set
33-
CONFIG_PM_RUNTIME=y
33+
CONFIG_PM=y
3434
CONFIG_NET=y
3535
CONFIG_PACKET=y
3636
CONFIG_UNIX=y

‎arch/arm/configs/kzm9g_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y
4343
CONFIG_VFP=y
4444
CONFIG_NEON=y
4545
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46-
CONFIG_PM_RUNTIME=y
46+
CONFIG_PM=y
4747
CONFIG_NET=y
4848
CONFIG_PACKET=y
4949
CONFIG_UNIX=y

‎arch/arm/configs/lager_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CONFIG_AUTO_ZRELADDR=y
3737
CONFIG_VFP=y
3838
CONFIG_NEON=y
3939
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40-
CONFIG_PM_RUNTIME=y
40+
CONFIG_PM=y
4141
CONFIG_NET=y
4242
CONFIG_PACKET=y
4343
CONFIG_UNIX=y

‎arch/arm/configs/mackerel_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_KEXEC=y
2828
CONFIG_VFP=y
2929
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3030
CONFIG_PM=y
31-
CONFIG_PM_RUNTIME=y
3231
CONFIG_NET=y
3332
CONFIG_PACKET=y
3433
CONFIG_UNIX=y

‎arch/arm/configs/marzen_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
3333
CONFIG_VFP=y
3434
CONFIG_KEXEC=y
3535
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36-
CONFIG_PM_RUNTIME=y
36+
CONFIG_PM=y
3737
CONFIG_NET=y
3838
CONFIG_PACKET=y
3939
CONFIG_UNIX=y

‎arch/arm/configs/omap1_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CONFIG_FPE_NWFPE=y
6363
CONFIG_BINFMT_MISC=y
6464
CONFIG_PM=y
6565
# CONFIG_SUSPEND is not set
66-
CONFIG_PM_RUNTIME=y
6766
CONFIG_NET=y
6867
CONFIG_PACKET=y
6968
CONFIG_UNIX=y

‎arch/arm/configs/prima2_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CONFIG_PREEMPT=y
1818
CONFIG_AEABI=y
1919
CONFIG_KEXEC=y
2020
CONFIG_BINFMT_MISC=y
21-
CONFIG_PM_RUNTIME=y
21+
CONFIG_PM=y
2222
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
2323
CONFIG_BLK_DEV_LOOP=y
2424
CONFIG_BLK_DEV_RAM=y

‎arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CONFIG_VFP=y
3232
CONFIG_NEON=y
3333
CONFIG_KERNEL_MODE_NEON=y
3434
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
35-
CONFIG_PM_RUNTIME=y
35+
CONFIG_PM=y
3636
CONFIG_PM_DEBUG=y
3737
CONFIG_PM_ADVANCED_DEBUG=y
3838
CONFIG_NET=y

‎arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONFIG_KEXEC=y
3939
CONFIG_VFP=y
4040
CONFIG_NEON=y
4141
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42-
CONFIG_PM_RUNTIME=y
42+
CONFIG_PM=y
4343
CONFIG_NET=y
4444
CONFIG_PACKET=y
4545
CONFIG_UNIX=y

‎arch/arm/configs/sunxi_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CONFIG_ARM_APPENDED_DTB=y
1111
CONFIG_ARM_ATAG_DTB_COMPAT=y
1212
CONFIG_VFP=y
1313
CONFIG_NEON=y
14-
CONFIG_PM_RUNTIME=y
14+
CONFIG_PM=y
1515
CONFIG_NET=y
1616
CONFIG_PACKET=y
1717
CONFIG_UNIX=y

‎arch/arm/configs/tegra_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
4646
CONFIG_CPU_IDLE=y
4747
CONFIG_VFP=y
4848
CONFIG_NEON=y
49-
CONFIG_PM_RUNTIME=y
49+
CONFIG_PM=y
5050
CONFIG_NET=y
5151
CONFIG_PACKET=y
5252
CONFIG_UNIX=y

‎arch/arm/configs/u8500_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONFIG_CPU_IDLE=y
2525
CONFIG_ARM_U8500_CPUIDLE=y
2626
CONFIG_VFP=y
2727
CONFIG_NEON=y
28-
CONFIG_PM_RUNTIME=y
28+
CONFIG_PM=y
2929
CONFIG_NET=y
3030
CONFIG_PACKET=y
3131
CONFIG_UNIX=y

‎arch/arm/configs/vt8500_v6_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CONFIG_ARM_APPENDED_DTB=y
1616
CONFIG_ARM_ATAG_DTB_COMPAT=y
1717
CONFIG_VFP=y
1818
CONFIG_NEON=y
19-
CONFIG_PM_RUNTIME=y
19+
CONFIG_PM=y
2020
CONFIG_NET=y
2121
CONFIG_UNIX=y
2222
CONFIG_INET=y

‎arch/arm/mach-omap2/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ config ARCH_OMAP3
1515
select ARM_CPU_SUSPEND if PM
1616
select OMAP_INTERCONNECT
1717
select PM_OPP if PM
18-
select PM_RUNTIME if CPU_IDLE
18+
select PM if CPU_IDLE
1919
select SOC_HAS_OMAP2_SDRC
2020

2121
config ARCH_OMAP4
@@ -32,7 +32,7 @@ config ARCH_OMAP4
3232
select PL310_ERRATA_588369 if CACHE_L2X0
3333
select PL310_ERRATA_727915 if CACHE_L2X0
3434
select PM_OPP if PM
35-
select PM_RUNTIME if CPU_IDLE
35+
select PM if CPU_IDLE
3636
select ARM_ERRATA_754322
3737
select ARM_ERRATA_775420
3838

@@ -103,7 +103,7 @@ config ARCH_OMAP2PLUS_TYPICAL
103103
select I2C_OMAP
104104
select MENELAUS if ARCH_OMAP2
105105
select NEON if CPU_V7
106-
select PM_RUNTIME
106+
select PM
107107
select REGULATOR
108108
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
109109
select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4

‎arch/mips/configs/db1xxx_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_PCI=y
3636
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
3737
CONFIG_PCCARD=y
3838
CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
39-
CONFIG_PM_RUNTIME=y
39+
CONFIG_PM=y
4040
CONFIG_NET=y
4141
CONFIG_PACKET=y
4242
CONFIG_PACKET_DIAG=y

‎arch/mips/configs/lemote2f_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ CONFIG_MIPS32_N32=y
3737
CONFIG_PM=y
3838
CONFIG_HIBERNATION=y
3939
CONFIG_PM_STD_PARTITION="/dev/hda3"
40-
CONFIG_PM_RUNTIME=y
4140
CONFIG_CPU_FREQ=y
4241
CONFIG_CPU_FREQ_DEBUG=y
4342
CONFIG_CPU_FREQ_STAT=m

‎arch/mips/configs/loongson3_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ CONFIG_BINFMT_MISC=m
5858
CONFIG_MIPS32_COMPAT=y
5959
CONFIG_MIPS32_O32=y
6060
CONFIG_MIPS32_N32=y
61-
CONFIG_PM_RUNTIME=y
61+
CONFIG_PM=y
6262
CONFIG_NET=y
6363
CONFIG_PACKET=y
6464
CONFIG_UNIX=y

‎arch/mips/configs/nlm_xlp_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ CONFIG_BINFMT_MISC=y
6161
CONFIG_MIPS32_COMPAT=y
6262
CONFIG_MIPS32_O32=y
6363
CONFIG_MIPS32_N32=y
64-
CONFIG_PM_RUNTIME=y
64+
CONFIG_PM=y
6565
CONFIG_PM_DEBUG=y
6666
CONFIG_NET=y
6767
CONFIG_PACKET=y

‎arch/mips/configs/nlm_xlr_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CONFIG_PCI=y
4141
CONFIG_PCI_MSI=y
4242
CONFIG_PCI_DEBUG=y
4343
CONFIG_BINFMT_MISC=m
44-
CONFIG_PM_RUNTIME=y
44+
CONFIG_PM=y
4545
CONFIG_PM_DEBUG=y
4646
CONFIG_NET=y
4747
CONFIG_PACKET=y

‎arch/powerpc/configs/ps3_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_KEXEC=y
3636
CONFIG_SCHED_SMT=y
3737
CONFIG_CMDLINE_BOOL=y
3838
CONFIG_CMDLINE=""
39-
CONFIG_PM_RUNTIME=y
39+
CONFIG_PM=y
4040
CONFIG_PM_DEBUG=y
4141
# CONFIG_SECCOMP is not set
4242
# CONFIG_PCI is not set

‎arch/sh/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ config CPU_SHX3
223223
config ARCH_SHMOBILE
224224
bool
225225
select ARCH_SUSPEND_POSSIBLE
226-
select PM_RUNTIME
226+
select PM
227227

228228
config CPU_HAS_PMU
229229
depends on CPU_SH4 || CPU_SH4A

‎arch/sh/configs/apsh4ad0a_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ CONFIG_PREEMPT=y
4747
CONFIG_BINFMT_MISC=y
4848
CONFIG_PM=y
4949
CONFIG_PM_DEBUG=y
50-
CONFIG_PM_RUNTIME=y
50+
CONFIG_PM=y
5151
CONFIG_CPU_IDLE=y
5252
CONFIG_NET=y
5353
CONFIG_PACKET=y

‎arch/sh/configs/sdk7786_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
8282
CONFIG_BINFMT_MISC=y
8383
CONFIG_PM=y
8484
CONFIG_PM_DEBUG=y
85-
CONFIG_PM_RUNTIME=y
85+
CONFIG_PM=y
8686
CONFIG_CPU_IDLE=y
8787
CONFIG_NET=y
8888
CONFIG_PACKET=y

‎drivers/usb/host/isp1760-hcd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
17391739
int retval = 1;
17401740
unsigned long flags;
17411741

1742-
/* if !PM_RUNTIME, root hub timers won't get shut down ... */
1742+
/* if !PM, root hub timers won't get shut down ... */
17431743
if (!HC_IS_RUNNING(hcd->state))
17441744
return 0;
17451745

‎drivers/usb/host/oxu210hp-hcd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3087,7 +3087,7 @@ static int oxu_hub_status_data(struct usb_hcd *hcd, char *buf)
30873087
int ports, i, retval = 1;
30883088
unsigned long flags;
30893089

3090-
/* if !PM_RUNTIME, root hub timers won't get shut down ... */
3090+
/* if !PM, root hub timers won't get shut down ... */
30913091
if (!HC_IS_RUNNING(hcd->state))
30923092
return 0;
30933093

‎include/linux/devfreq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ extern struct devfreq *devm_devfreq_add_device(struct device *dev,
188188
extern void devm_devfreq_remove_device(struct device *dev,
189189
struct devfreq *devfreq);
190190

191-
/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
191+
/* Supposed to be called by PM callbacks */
192192
extern int devfreq_suspend_device(struct devfreq *devfreq);
193193
extern int devfreq_resume_device(struct devfreq *devfreq);
194194

‎kernel/power/Kconfig

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ config PM_STD_PARTITION
9494
config PM_SLEEP
9595
def_bool y
9696
depends on SUSPEND || HIBERNATE_CALLBACKS
97-
select PM_RUNTIME
97+
select PM
9898

9999
config PM_SLEEP_SMP
100100
def_bool y
@@ -130,23 +130,19 @@ config PM_WAKELOCKS_GC
130130
depends on PM_WAKELOCKS
131131
default y
132132

133-
config PM_RUNTIME
134-
bool "Run-time PM core functionality"
133+
config PM
134+
bool "Device power management core functionality"
135135
---help---
136136
Enable functionality allowing I/O devices to be put into energy-saving
137-
(low power) states at run time (or autosuspended) after a specified
138-
period of inactivity and woken up in response to a hardware-generated
137+
(low power) states, for example after a specified period of inactivity
138+
(autosuspended), and woken up in response to a hardware-generated
139139
wake-up event or a driver's request.
140140

141141
Hardware support is generally required for this functionality to work
142142
and the bus type drivers of the buses the devices are on are
143-
responsible for the actual handling of the autosuspend requests and
143+
responsible for the actual handling of device suspend requests and
144144
wake-up events.
145145

146-
config PM
147-
def_bool y
148-
depends on PM_SLEEP || PM_RUNTIME
149-
150146
config PM_DEBUG
151147
bool "Power Management Debug Support"
152148
depends on PM

0 commit comments

Comments
 (0)