PM / Kconfig: Replace PM_RUNTIME with PM in dependencies

After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so Kconfig options
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace PM_RUNTIME with PM in Kconfig dependencies throughout the
tree.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Tejun Heo <tj@kernel.org>

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index b9e3f1c61bafe1bb3bee2b350e488779ab41838b..bb9c56e44a7be5bc3ce0ddb73baeddab777b42fe 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS
        select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
-       select PM_GENERIC_DOMAINS if PM_RUNTIME
+       select PM_GENERIC_DOMAINS if PM
        select S5P_DEV_MFC
        select SRAM
        select MFD_SYSCON

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 536d13b0bea69d7dc1465ce6c5d75766ef4cefa9..ce9531ed44db857d857bc212a83f01fd3b721271 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -232,7 +232,7 @@ config IA64_SGI_UV
 config IA64_HP_SIM
        bool "Ski-simulator"
        select SWIOTLB
-       depends on !PM_RUNTIME
+       depends on !PM
 
 endchoice
 

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cd4cccbfd2abf6642eb7532c3412317bb279522f..a3a13605a9c42d13baed5746f9f1bfb9bc30536c 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -61,7 +61,7 @@ config ATA_ACPI
 
 config SATA_ZPODD
        bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
-       depends on ATA_ACPI && PM_RUNTIME
+       depends on ATA_ACPI && PM
        default n
        help
          This option adds support for SATA Zero Power Optical Disc

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3aac88f1d54ae518a37998c1eb92dfb32020c158..1412c3edd5a261229a55456d488e94b9023dae26 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -112,7 +112,7 @@ config VIDEO_OMAP3_DEBUG
 config VIDEO_S3C_CAMIF
        tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
-       depends on PM_RUNTIME
+       depends on PM
        depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
        depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG

diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig
index beb180e71ba0e1022611dc3bdb1eacc9e14478f4..5a1835dd65e858e5622f5b01fbe5fe4f4b63e5bf 100644 (file)
--- a/drivers/media/platform/s5p-tv/Kconfig
+++ b/drivers/media/platform/s5p-tv/Kconfig
@@ -8,7 +8,7 @@
 
 config VIDEO_SAMSUNG_S5P_TV
        bool "Samsung TV driver for S5P platform"
-       depends on PM_RUNTIME
+       depends on PM
        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        default n
        ---help---

diff --git a/drivers/staging/gdm72xx/Kconfig b/drivers/staging/gdm72xx/Kconfig
index 5836503caa7b0009a581a0dbb4c48b7de152c44b..bf11a7fbfc516ebb9d131747a2ee44eac0757138 100644 (file)
--- a/drivers/staging/gdm72xx/Kconfig
+++ b/drivers/staging/gdm72xx/Kconfig
@@ -53,7 +53,7 @@ if WIMAX_GDM72XX_USB
 
 config WIMAX_GDM72XX_USB_PM
        bool "Enable power management support"
-       depends on PM_RUNTIME
+       depends on PM
        help
          Enable USB power management in order to reduce power consumption
          while the interface is not in use.

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 9cfda6a72194471296d2216d4a794a0b1499c98b..cc0ced08bae2983e0b0801dccf6d089d4e024628 100644 (file)
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -43,7 +43,7 @@ config USB_DYNAMIC_MINORS
 
 config USB_OTG
        bool "OTG support"
-       depends on PM_RUNTIME
+       depends on PM
        default n
        help
          The most notable feature of USB OTG is support for a

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 0cd1f44f0ee8d146fcffa132092f570f44d0e48e..c6d0c8e745b976232301e55493b45756d5635fb1 100644 (file)
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -20,7 +20,7 @@ config AB8500_USB
 
 config FSL_USB2_OTG
        bool "Freescale USB OTG Transceiver Driver"
-       depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM_RUNTIME
+       depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM
        select USB_OTG
        select USB_PHY
        help
@@ -153,7 +153,7 @@ config USB_MSM_OTG
 
 config USB_MV_OTG
        tristate "Marvell USB OTG support"
-       depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME
+       depends on USB_EHCI_MV && USB_MV_UDC && PM
        select USB_OTG
        select USB_PHY
        help

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 715f299af6ea6ed4402b968b3d74bb507fe4dee1..ec84758f0e23709b8da5bc251f84e4fd130ecbe4 100644 (file)
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -41,7 +41,7 @@ config USB_STORAGE_REALTEK
 
 config REALTEK_AUTOPM
        bool "Realtek Card Reader autosuspend support"
-       depends on USB_STORAGE_REALTEK && PM_RUNTIME
+       depends on USB_STORAGE_REALTEK && PM
        default y
 
 config USB_STORAGE_DATAFAB