Skip to content

Commit 5d6a546

Browse files
torvaldstorvalds
committed
Merge tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull CONFIG_PM_RUNTIME elimination from Rafael Wysocki: "This removes the last few uses of CONFIG_PM_RUNTIME introduced recently and makes that config option finally go away. CONFIG_PM will be available directly from the menu now and also it will be selected automatically if CONFIG_SUSPEND or CONFIG_HIBERNATION is set" * tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: Eliminate CONFIG_PM_RUNTIME tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2 parents 787140a + 464ed18 commit 5d6a546

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+52
-61
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/spi/spi-img-spfi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ static int img_spfi_remove(struct platform_device *pdev)
663663
return 0;
664664
}
665665

666-
#ifdef CONFIG_PM_RUNTIME
666+
#ifdef CONFIG_PM
667667
static int img_spfi_runtime_suspend(struct device *dev)
668668
{
669669
struct spi_master *master = dev_get_drvdata(dev);
@@ -692,7 +692,7 @@ static int img_spfi_runtime_resume(struct device *dev)
692692

693693
return 0;
694694
}
695-
#endif /* CONFIG_PM_RUNTIME */
695+
#endif /* CONFIG_PM */
696696

697697
#ifdef CONFIG_PM_SLEEP
698698
static int img_spfi_suspend(struct device *dev)

‎drivers/spi/spi-meson-spifc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ static int meson_spifc_resume(struct device *dev)
413413
}
414414
#endif /* CONFIG_PM_SLEEP */
415415

416-
#ifdef CONFIG_PM_RUNTIME
416+
#ifdef CONFIG_PM
417417
static int meson_spifc_runtime_suspend(struct device *dev)
418418
{
419419
struct spi_master *master = dev_get_drvdata(dev);
@@ -431,7 +431,7 @@ static int meson_spifc_runtime_resume(struct device *dev)
431431

432432
return clk_prepare_enable(spifc->clk);
433433
}
434-
#endif /* CONFIG_PM_RUNTIME */
434+
#endif /* CONFIG_PM */
435435

436436
static const struct dev_pm_ops meson_spifc_pm_ops = {
437437
SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume)

‎drivers/tty/serial/8250/8250_omap.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ static int omap_8250_startup(struct uart_port *port)
561561
if (ret)
562562
goto err;
563563

564-
#ifdef CONFIG_PM_RUNTIME
564+
#ifdef CONFIG_PM
565565
up->capabilities |= UART_CAP_RPM;
566566
#endif
567567

@@ -997,12 +997,12 @@ static int omap8250_probe(struct platform_device *pdev)
997997
up.port.fifosize = 64;
998998
up.tx_loadsz = 64;
999999
up.capabilities = UART_CAP_FIFO;
1000-
#ifdef CONFIG_PM_RUNTIME
1000+
#ifdef CONFIG_PM
10011001
/*
1002-
* PM_RUNTIME is mostly transparent. However to do it right we need to a
1002+
* Runtime PM is mostly transparent. However to do it right we need to a
10031003
* TX empty interrupt before we can put the device to auto idle. So if
1004-
* PM_RUNTIME is not enabled we don't add that flag and can spare that
1005-
* one extra interrupt in the TX path.
1004+
* PM is not enabled we don't add that flag and can spare that one extra
1005+
* interrupt in the TX path.
10061006
*/
10071007
up.capabilities |= UART_CAP_RPM;
10081008
#endif
@@ -1105,7 +1105,7 @@ static int omap8250_remove(struct platform_device *pdev)
11051105
return 0;
11061106
}
11071107

1108-
#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
1108+
#ifdef CONFIG_PM
11091109

11101110
static inline void omap8250_enable_wakeirq(struct omap8250_priv *priv,
11111111
bool enable)
@@ -1179,7 +1179,7 @@ static int omap8250_resume(struct device *dev)
11791179
#define omap8250_complete NULL
11801180
#endif
11811181

1182-
#ifdef CONFIG_PM_RUNTIME
1182+
#ifdef CONFIG_PM
11831183
static int omap8250_lost_context(struct uart_8250_port *up)
11841184
{
11851185
u32 val;

‎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

0 commit comments

Comments
 (0)