Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 035f10ee4e978db0a01d0f832e328b4a62f8310e

Authored by Rafael J. Wysocki
2 parents 0a06664286 f2ea5e1708
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge branch 'pm-runtime' 

* pm-runtime:
  power / PM: Eliminate CONFIG_PM_RUNTIME
  NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
  PM: Remove the SET_PM_RUNTIME_PM_OPS() macro
  mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
  PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
  ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM

Showing 53 changed files Side-by-side Diff

arch/arm/kernel/perf_event.c
Diff comments   View file @ 035f10e
... ... @@ -484,7 +484,7 @@
484 484 armpmu->stop(armpmu);
485 485 }
486 486  
487   -#ifdef CONFIG_PM_RUNTIME
  487 +#ifdef CONFIG_PM
488 488 static int armpmu_runtime_resume(struct device *dev)
489 489 {
490 490 struct arm_pmu_platdata *plat = dev_get_platdata(dev);
arch/arm/mach-davinci/pm_domain.c
Diff comments   View file @ 035f10e
... ... @@ -14,7 +14,7 @@
14 14 #include <linux/pm_clock.h>
15 15 #include <linux/platform_device.h>
16 16  
17   -#ifdef CONFIG_PM_RUNTIME
  17 +#ifdef CONFIG_PM
18 18 static int davinci_pm_runtime_suspend(struct device *dev)
19 19 {
20 20 int ret;
arch/arm/mach-exynos/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -21,7 +21,7 @@
21 21 select HAVE_S3C_RTC if RTC_CLASS
22 22 select PINCTRL
23 23 select PINCTRL_EXYNOS
24   - select PM_GENERIC_DOMAINS if PM_RUNTIME
  24 + select PM_GENERIC_DOMAINS if PM
25 25 select S5P_DEV_MFC
26 26 select SRAM
27 27 select MFD_SYSCON
arch/arm/mach-keystone/pm_domain.c
Diff comments   View file @ 035f10e
... ... @@ -19,7 +19,7 @@
19 19 #include <linux/clk-provider.h>
20 20 #include <linux/of.h>
21 21  
22   -#ifdef CONFIG_PM_RUNTIME
  22 +#ifdef CONFIG_PM
23 23 static int keystone_pm_runtime_suspend(struct device *dev)
24 24 {
25 25 int ret;
arch/arm/mach-omap1/pm_bus.c
Diff comments   View file @ 035f10e
... ... @@ -21,7 +21,7 @@
21 21  
22 22 #include "soc.h"
23 23  
24   -#ifdef CONFIG_PM_RUNTIME
  24 +#ifdef CONFIG_PM
25 25 static int omap1_pm_runtime_suspend(struct device *dev)
26 26 {
27 27 int ret;
... ... @@ -59,7 +59,7 @@
59 59 #define OMAP1_PM_DOMAIN (&default_pm_domain)
60 60 #else
61 61 #define OMAP1_PM_DOMAIN NULL
62   -#endif /* CONFIG_PM_RUNTIME */
  62 +#endif /* CONFIG_PM */
63 63  
64 64 static struct pm_clk_notifier_block platform_bus_notifier = {
65 65 .pm_domain = OMAP1_PM_DOMAIN,
arch/arm/mach-omap2/io.c
Diff comments   View file @ 035f10e
... ... @@ -361,7 +361,7 @@
361 361 u8 postsetup_state;
362 362  
363 363 /* Set the default postsetup state for all hwmods */
364   -#ifdef CONFIG_PM_RUNTIME
  364 +#ifdef CONFIG_PM
365 365 postsetup_state = _HWMOD_STATE_IDLE;
366 366 #else
367 367 postsetup_state = _HWMOD_STATE_ENABLED;
arch/arm/mach-omap2/omap_device.c
Diff comments   View file @ 035f10e
... ... @@ -588,7 +588,7 @@
588 588 return ERR_PTR(ret);
589 589 }
590 590  
591   -#ifdef CONFIG_PM_RUNTIME
  591 +#ifdef CONFIG_PM
592 592 static int _od_runtime_suspend(struct device *dev)
593 593 {
594 594 struct platform_device *pdev = to_platform_device(dev);
... ... @@ -232,7 +232,7 @@
232 232 config IA64_HP_SIM
233 233 bool "Ski-simulator"
234 234 select SWIOTLB
235   - depends on !PM_RUNTIME
  235 + depends on !PM
236 236  
237 237 endchoice
238 238  
arch/x86/kernel/apic/io_apic.c
Diff comments   View file @ 035f10e
... ... @@ -3968,7 +3968,7 @@
3968 3968 {
3969 3969 if (dev->power.is_prepared)
3970 3970 return true;
3971   -#ifdef CONFIG_PM_RUNTIME
  3971 +#ifdef CONFIG_PM
3972 3972 if (dev->power.runtime_status == RPM_SUSPENDING)
3973 3973 return true;
3974 3974 #endif
... ... @@ -61,7 +61,7 @@
61 61  
62 62 config SATA_ZPODD
63 63 bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
64   - depends on ATA_ACPI && PM_RUNTIME
  64 + depends on ATA_ACPI && PM
65 65 default n
66 66 help
67 67 This option adds support for SATA Zero Power Optical Disc
drivers/media/platform/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -112,7 +112,7 @@
112 112 config VIDEO_S3C_CAMIF
113 113 tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
114 114 depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
115   - depends on PM_RUNTIME
  115 + depends on PM
116 116 depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
117 117 depends on HAS_DMA
118 118 select VIDEOBUF2_DMA_CONTIG
drivers/media/platform/s5p-tv/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -8,7 +8,7 @@
8 8  
9 9 config VIDEO_SAMSUNG_S5P_TV
10 10 bool "Samsung TV driver for S5P platform"
11   - depends on PM_RUNTIME
  11 + depends on PM
12 12 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
13 13 default n
14 14 ---help---
drivers/mmc/host/atmel-mci.c
Diff comments   View file @ 035f10e
... ... @@ -2561,7 +2561,7 @@
2561 2561 static const struct dev_pm_ops atmci_dev_pm_ops = {
2562 2562 SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
2563 2563 pm_runtime_force_resume)
2564   - SET_PM_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
  2564 + SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
2565 2565 };
2566 2566  
2567 2567 static struct platform_driver atmci_driver = {
drivers/nfc/trf7970a.c
Diff comments   View file @ 035f10e
... ... @@ -2154,7 +2154,7 @@
2154 2154 }
2155 2155 #endif
2156 2156  
2157   -#ifdef CONFIG_PM_RUNTIME
  2157 +#ifdef CONFIG_PM
2158 2158 static int trf7970a_pm_runtime_suspend(struct device *dev)
2159 2159 {
2160 2160 struct spi_device *spi = container_of(dev, struct spi_device, dev);
drivers/phy/phy-omap-usb2.c
Diff comments   View file @ 035f10e
... ... @@ -322,7 +322,7 @@
322 322 return 0;
323 323 }
324 324  
325   -#ifdef CONFIG_PM_RUNTIME
  325 +#ifdef CONFIG_PM
326 326  
327 327 static int omap_usb2_runtime_suspend(struct device *dev)
328 328 {
drivers/phy/phy-ti-pipe3.c
Diff comments   View file @ 035f10e
... ... @@ -423,7 +423,7 @@
423 423 return 0;
424 424 }
425 425  
426   -#ifdef CONFIG_PM_RUNTIME
  426 +#ifdef CONFIG_PM
427 427  
428 428 static int ti_pipe3_runtime_suspend(struct device *dev)
429 429 {
drivers/power/pm2301_charger.c
Diff comments   View file @ 035f10e
... ... @@ -951,8 +951,6 @@
951 951  
952 952 #endif
953 953  
954   -#ifdef CONFIG_PM_RUNTIME
955   -
956 954 static int pm2xxx_runtime_suspend(struct device *dev)
957 955 {
958 956 struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
... ... @@ -976,8 +974,6 @@
976 974  
977 975 return 0;
978 976 }
979   -
980   -#endif
981 977  
982 978 static const struct dev_pm_ops pm2xxx_pm_ops = {
983 979 SET_SYSTEM_SLEEP_PM_OPS(pm2xxx_wall_charger_suspend,
drivers/scsi/scsi_pm.c
Diff comments   View file @ 035f10e
... ... @@ -213,8 +213,6 @@
213 213  
214 214 #endif /* CONFIG_PM_SLEEP */
215 215  
216   -#ifdef CONFIG_PM_RUNTIME
217   -
218 216 static int sdev_runtime_suspend(struct device *dev)
219 217 {
220 218 const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
... ... @@ -331,14 +329,6 @@
331 329 {
332 330 pm_runtime_put_sync(&shost->shost_gendev);
333 331 }
334   -
335   -#else
336   -
337   -#define scsi_runtime_suspend NULL
338   -#define scsi_runtime_resume NULL
339   -#define scsi_runtime_idle NULL
340   -
341   -#endif /* CONFIG_PM_RUNTIME */
342 332  
343 333 const struct dev_pm_ops scsi_bus_pm_ops = {
344 334 .prepare = scsi_bus_prepare,
drivers/scsi/scsi_priv.h
Diff comments   View file @ 035f10e
... ... @@ -155,8 +155,7 @@
155 155 /* scsi_pm.c */
156 156 #ifdef CONFIG_PM
157 157 extern const struct dev_pm_ops scsi_bus_pm_ops;
158   -#endif
159   -#ifdef CONFIG_PM_RUNTIME
  158 +
160 159 extern void scsi_autopm_get_target(struct scsi_target *);
161 160 extern void scsi_autopm_put_target(struct scsi_target *);
162 161 extern int scsi_autopm_get_host(struct Scsi_Host *);
... ... @@ -166,7 +165,7 @@
166 165 static inline void scsi_autopm_put_target(struct scsi_target *t) {}
167 166 static inline int scsi_autopm_get_host(struct Scsi_Host *h) { return 0; }
168 167 static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}
169   -#endif /* CONFIG_PM_RUNTIME */
  168 +#endif /* CONFIG_PM */
170 169  
171 170 extern struct async_domain scsi_sd_pm_domain;
172 171 extern struct async_domain scsi_sd_probe_domain;
drivers/scsi/ufs/ufshcd-pci.c
Diff comments   View file @ 035f10e
... ... @@ -62,12 +62,7 @@
62 62 {
63 63 return ufshcd_system_resume(dev_get_drvdata(dev));
64 64 }
65   -#else
66   -#define ufshcd_pci_suspend NULL
67   -#define ufshcd_pci_resume NULL
68   -#endif /* CONFIG_PM */
69 65  
70   -#ifdef CONFIG_PM_RUNTIME
71 66 static int ufshcd_pci_runtime_suspend(struct device *dev)
72 67 {
73 68 return ufshcd_runtime_suspend(dev_get_drvdata(dev));
74 69  
... ... @@ -80,11 +75,13 @@
80 75 {
81 76 return ufshcd_runtime_idle(dev_get_drvdata(dev));
82 77 }
83   -#else /* !CONFIG_PM_RUNTIME */
  78 +#else /* !CONFIG_PM */
  79 +#define ufshcd_pci_suspend NULL
  80 +#define ufshcd_pci_resume NULL
84 81 #define ufshcd_pci_runtime_suspend NULL
85 82 #define ufshcd_pci_runtime_resume NULL
86 83 #define ufshcd_pci_runtime_idle NULL
87   -#endif /* CONFIG_PM_RUNTIME */
  84 +#endif /* CONFIG_PM */
88 85  
89 86 /**
90 87 * ufshcd_pci_shutdown - main function to put the controller in reset state
drivers/scsi/ufs/ufshcd-pltfrm.c
Diff comments   View file @ 035f10e
... ... @@ -261,12 +261,7 @@
261 261 {
262 262 return ufshcd_system_resume(dev_get_drvdata(dev));
263 263 }
264   -#else
265   -#define ufshcd_pltfrm_suspend NULL
266   -#define ufshcd_pltfrm_resume NULL
267   -#endif
268 264  
269   -#ifdef CONFIG_PM_RUNTIME
270 265 static int ufshcd_pltfrm_runtime_suspend(struct device *dev)
271 266 {
272 267 return ufshcd_runtime_suspend(dev_get_drvdata(dev));
273 268  
... ... @@ -279,11 +274,13 @@
279 274 {
280 275 return ufshcd_runtime_idle(dev_get_drvdata(dev));
281 276 }
282   -#else /* !CONFIG_PM_RUNTIME */
  277 +#else /* !CONFIG_PM */
  278 +#define ufshcd_pltfrm_suspend NULL
  279 +#define ufshcd_pltfrm_resume NULL
283 280 #define ufshcd_pltfrm_runtime_suspend NULL
284 281 #define ufshcd_pltfrm_runtime_resume NULL
285 282 #define ufshcd_pltfrm_runtime_idle NULL
286   -#endif /* CONFIG_PM_RUNTIME */
  283 +#endif /* CONFIG_PM */
287 284  
288 285 static void ufshcd_pltfrm_shutdown(struct platform_device *pdev)
289 286 {
drivers/spi/spi-coldfire-qspi.c
Diff comments   View file @ 035f10e
... ... @@ -491,7 +491,7 @@
491 491 }
492 492 #endif
493 493  
494   -#ifdef CONFIG_PM_RUNTIME
  494 +#ifdef CONFIG_PM
495 495 static int mcfqspi_runtime_suspend(struct device *dev)
496 496 {
497 497 struct spi_master *master = dev_get_drvdata(dev);
drivers/spi/spi-orion.c
Diff comments   View file @ 035f10e
... ... @@ -523,7 +523,7 @@
523 523  
524 524 MODULE_ALIAS("platform:" DRIVER_NAME);
525 525  
526   -#ifdef CONFIG_PM_RUNTIME
  526 +#ifdef CONFIG_PM
527 527 static int orion_spi_runtime_suspend(struct device *dev)
528 528 {
529 529 struct spi_master *master = dev_get_drvdata(dev);
drivers/spi/spi-pxa2xx.c
Diff comments   View file @ 035f10e
... ... @@ -1307,7 +1307,7 @@
1307 1307 }
1308 1308 #endif
1309 1309  
1310   -#ifdef CONFIG_PM_RUNTIME
  1310 +#ifdef CONFIG_PM
1311 1311 static int pxa2xx_spi_runtime_suspend(struct device *dev)
1312 1312 {
1313 1313 struct driver_data *drv_data = dev_get_drvdata(dev);
drivers/spi/spi-qup.c
Diff comments   View file @ 035f10e
... ... @@ -646,7 +646,7 @@
646 646 return ret;
647 647 }
648 648  
649   -#ifdef CONFIG_PM_RUNTIME
  649 +#ifdef CONFIG_PM
650 650 static int spi_qup_pm_suspend_runtime(struct device *device)
651 651 {
652 652 struct spi_master *master = dev_get_drvdata(device);
... ... @@ -672,7 +672,7 @@
672 672 writel_relaxed(config, controller->base + QUP_CONFIG);
673 673 return 0;
674 674 }
675   -#endif /* CONFIG_PM_RUNTIME */
  675 +#endif /* CONFIG_PM */
676 676  
677 677 #ifdef CONFIG_PM_SLEEP
678 678 static int spi_qup_suspend(struct device *device)
drivers/spi/spi-rockchip.c
Diff comments   View file @ 035f10e
... ... @@ -801,7 +801,7 @@
801 801 }
802 802 #endif /* CONFIG_PM_SLEEP */
803 803  
804   -#ifdef CONFIG_PM_RUNTIME
  804 +#ifdef CONFIG_PM
805 805 static int rockchip_spi_runtime_suspend(struct device *dev)
806 806 {
807 807 struct spi_master *master = dev_get_drvdata(dev);
... ... @@ -829,7 +829,7 @@
829 829  
830 830 return ret;
831 831 }
832   -#endif /* CONFIG_PM_RUNTIME */
  832 +#endif /* CONFIG_PM */
833 833  
834 834 static const struct dev_pm_ops rockchip_spi_pm = {
835 835 SET_SYSTEM_SLEEP_PM_OPS(rockchip_spi_suspend, rockchip_spi_resume)
drivers/spi/spi-s3c64xx.c
Diff comments   View file @ 035f10e
... ... @@ -1266,7 +1266,7 @@
1266 1266 }
1267 1267 #endif /* CONFIG_PM_SLEEP */
1268 1268  
1269   -#ifdef CONFIG_PM_RUNTIME
  1269 +#ifdef CONFIG_PM
1270 1270 static int s3c64xx_spi_runtime_suspend(struct device *dev)
1271 1271 {
1272 1272 struct spi_master *master = dev_get_drvdata(dev);
... ... @@ -1296,7 +1296,7 @@
1296 1296  
1297 1297 return 0;
1298 1298 }
1299   -#endif /* CONFIG_PM_RUNTIME */
  1299 +#endif /* CONFIG_PM */
1300 1300  
1301 1301 static const struct dev_pm_ops s3c64xx_spi_pm = {
1302 1302 SET_SYSTEM_SLEEP_PM_OPS(s3c64xx_spi_suspend, s3c64xx_spi_resume)
drivers/staging/gdm72xx/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -53,7 +53,7 @@
53 53  
54 54 config WIMAX_GDM72XX_USB_PM
55 55 bool "Enable power management support"
56   - depends on PM_RUNTIME
  56 + depends on PM
57 57 help
58 58 Enable USB power management in order to reduce power consumption
59 59 while the interface is not in use.
drivers/tty/serial/8250/8250_dw.c
Diff comments   View file @ 035f10e
... ... @@ -489,7 +489,7 @@
489 489 }
490 490 #endif /* CONFIG_PM_SLEEP */
491 491  
492   -#ifdef CONFIG_PM_RUNTIME
  492 +#ifdef CONFIG_PM
493 493 static int dw8250_runtime_suspend(struct device *dev)
494 494 {
495 495 struct dw8250_data *data = dev_get_drvdata(dev);
drivers/tty/serial/8250/8250_mtk.c
Diff comments   View file @ 035f10e
... ... @@ -244,7 +244,7 @@
244 244 }
245 245 #endif /* CONFIG_PM_SLEEP */
246 246  
247   -#ifdef CONFIG_PM_RUNTIME
  247 +#ifdef CONFIG_PM
248 248 static int mtk8250_runtime_suspend(struct device *dev)
249 249 {
250 250 struct mtk8250_data *data = dev_get_drvdata(dev);
drivers/tty/serial/mfd.c
Diff comments   View file @ 035f10e
... ... @@ -1252,12 +1252,7 @@
1252 1252 }
1253 1253 return 0;
1254 1254 }
1255   -#else
1256   -#define serial_hsu_suspend NULL
1257   -#define serial_hsu_resume NULL
1258   -#endif
1259 1255  
1260   -#ifdef CONFIG_PM_RUNTIME
1261 1256 static int serial_hsu_runtime_idle(struct device *dev)
1262 1257 {
1263 1258 pm_schedule_suspend(dev, 500);
... ... @@ -1274,6 +1269,8 @@
1274 1269 return 0;
1275 1270 }
1276 1271 #else
  1272 +#define serial_hsu_suspend NULL
  1273 +#define serial_hsu_resume NULL
1277 1274 #define serial_hsu_runtime_idle NULL
1278 1275 #define serial_hsu_runtime_suspend NULL
1279 1276 #define serial_hsu_runtime_resume NULL
drivers/tty/serial/msm_serial_hs.c
Diff comments   View file @ 035f10e
... ... @@ -1792,7 +1792,7 @@
1792 1792 }
1793 1793 module_exit(msm_serial_hs_exit);
1794 1794  
1795   -#ifdef CONFIG_PM_RUNTIME
  1795 +#ifdef CONFIG_PM
1796 1796 static int msm_hs_runtime_idle(struct device *dev)
1797 1797 {
1798 1798 /*
drivers/tty/serial/omap-serial.c
Diff comments   View file @ 035f10e
... ... @@ -1799,7 +1799,7 @@
1799 1799 }
1800 1800 }
1801 1801  
1802   -#ifdef CONFIG_PM_RUNTIME
  1802 +#ifdef CONFIG_PM
1803 1803 static void serial_omap_restore_context(struct uart_omap_port *up)
1804 1804 {
1805 1805 if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
drivers/usb/core/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -43,7 +43,7 @@
43 43  
44 44 config USB_OTG
45 45 bool "OTG support"
46   - depends on PM_RUNTIME
  46 + depends on PM
47 47 default n
48 48 help
49 49 The most notable feature of USB OTG is support for a
drivers/usb/phy/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -20,7 +20,7 @@
20 20  
21 21 config FSL_USB2_OTG
22 22 bool "Freescale USB OTG Transceiver Driver"
23   - depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM_RUNTIME
  23 + depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM
24 24 select USB_OTG
25 25 select USB_PHY
26 26 help
... ... @@ -153,7 +153,7 @@
153 153  
154 154 config USB_MV_OTG
155 155 tristate "Marvell USB OTG support"
156   - depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME
  156 + depends on USB_EHCI_MV && USB_MV_UDC && PM
157 157 select USB_OTG
158 158 select USB_PHY
159 159 help
drivers/usb/storage/Kconfig
Diff comments   View file @ 035f10e
... ... @@ -41,7 +41,7 @@
41 41  
42 42 config REALTEK_AUTOPM
43 43 bool "Realtek Card Reader autosuspend support"
44   - depends on USB_STORAGE_REALTEK && PM_RUNTIME
  44 + depends on USB_STORAGE_REALTEK && PM
45 45 default y
46 46  
47 47 config USB_STORAGE_DATAFAB
drivers/video/fbdev/s3c-fb.c
Diff comments   View file @ 035f10e
... ... @@ -1630,7 +1630,7 @@
1630 1630 }
1631 1631 #endif
1632 1632  
1633   -#ifdef CONFIG_PM_RUNTIME
  1633 +#ifdef CONFIG_PM
1634 1634 static int s3c_fb_runtime_suspend(struct device *dev)
1635 1635 {
1636 1636 struct s3c_fb *sfb = dev_get_drvdata(dev);
drivers/video/fbdev/sh_mobile_meram.c
Diff comments   View file @ 035f10e
... ... @@ -569,7 +569,7 @@
569 569 * Power management
570 570 */
571 571  
572   -#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
  572 +#ifdef CONFIG_PM
573 573 static int sh_mobile_meram_suspend(struct device *dev)
574 574 {
575 575 struct platform_device *pdev = to_platform_device(dev);
... ... @@ -612,7 +612,7 @@
612 612 meram_write_reg(priv->base, common_regs[i], priv->regs[i]);
613 613 return 0;
614 614 }
615   -#endif /* CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME */
  615 +#endif /* CONFIG_PM */
616 616  
617 617 static UNIVERSAL_DEV_PM_OPS(sh_mobile_meram_dev_pm_ops,
618 618 sh_mobile_meram_suspend,
... ... @@ -351,8 +351,6 @@
351 351 #define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn)
352 352 #endif
353 353  
354   -#define SET_PM_RUNTIME_PM_OPS SET_RUNTIME_PM_OPS
355   -
356 354 /*
357 355 * Use this if you want to use the same suspend and resume callbacks for suspend
358 356 * to RAM and hibernation.
include/scsi/scsi_device.h
Diff comments   View file @ 035f10e
... ... @@ -441,13 +441,13 @@
441 441 extern void sdev_disable_disk_events(struct scsi_device *sdev);
442 442 extern void sdev_enable_disk_events(struct scsi_device *sdev);
443 443  
444   -#ifdef CONFIG_PM_RUNTIME
  444 +#ifdef CONFIG_PM
445 445 extern int scsi_autopm_get_device(struct scsi_device *);
446 446 extern void scsi_autopm_put_device(struct scsi_device *);
447 447 #else
448 448 static inline int scsi_autopm_get_device(struct scsi_device *d) { return 0; }
449 449 static inline void scsi_autopm_put_device(struct scsi_device *d) {}
450   -#endif /* CONFIG_PM_RUNTIME */
  450 +#endif /* CONFIG_PM */
451 451  
452 452 static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
453 453 {
kernel/trace/Makefile
Diff comments   View file @ 035f10e
... ... @@ -55,7 +55,7 @@
55 55 obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
56 56 obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
57 57 obj-$(CONFIG_TRACEPOINTS) += power-traces.o
58   -ifeq ($(CONFIG_PM_RUNTIME),y)
  58 +ifeq ($(CONFIG_PM),y)
59 59 obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
60 60 endif
61 61 ifeq ($(CONFIG_TRACING),y)
sound/pci/hda/hda_controller.c
Diff comments   View file @ 035f10e
... ... @@ -1676,7 +1676,7 @@
1676 1676 u8 sd_status;
1677 1677 int i;
1678 1678  
1679   -#ifdef CONFIG_PM_RUNTIME
  1679 +#ifdef CONFIG_PM
1680 1680 if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
1681 1681 if (!pm_runtime_active(chip->card->dev))
1682 1682 return IRQ_NONE;
sound/pci/hda/hda_intel.c
Diff comments   View file @ 035f10e
... ... @@ -857,7 +857,7 @@
857 857 }
858 858 #endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
859 859  
860   -#ifdef CONFIG_PM_RUNTIME
  860 +#ifdef CONFIG_PM
861 861 static int azx_runtime_suspend(struct device *dev)
862 862 {
863 863 struct snd_card *card = dev_get_drvdata(dev);
... ... @@ -955,9 +955,6 @@
955 955 return 0;
956 956 }
957 957  
958   -#endif /* CONFIG_PM_RUNTIME */
959   -
960   -#ifdef CONFIG_PM
961 958 static const struct dev_pm_ops azx_pm = {
962 959 SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume)
963 960 SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle)
sound/soc/codecs/cs35l32.c
Diff comments   View file @ 035f10e
... ... @@ -550,7 +550,7 @@
550 550 return 0;
551 551 }
552 552  
553   -#ifdef CONFIG_PM_RUNTIME
  553 +#ifdef CONFIG_PM
554 554 static int cs35l32_runtime_suspend(struct device *dev)
555 555 {
556 556 struct cs35l32_private *cs35l32 = dev_get_drvdata(dev);
sound/soc/codecs/cs42xx8.c
Diff comments   View file @ 035f10e
... ... @@ -537,7 +537,7 @@
537 537 }
538 538 EXPORT_SYMBOL_GPL(cs42xx8_probe);
539 539  
540   -#ifdef CONFIG_PM_RUNTIME
  540 +#ifdef CONFIG_PM
541 541 static int cs42xx8_runtime_resume(struct device *dev)
542 542 {
543 543 struct cs42xx8_priv *cs42xx8 = dev_get_drvdata(dev);
sound/soc/codecs/max98090.c
Diff comments   View file @ 035f10e
... ... @@ -2492,7 +2492,7 @@
2492 2492 return 0;
2493 2493 }
2494 2494  
2495   -#ifdef CONFIG_PM_RUNTIME
  2495 +#ifdef CONFIG_PM
2496 2496 static int max98090_runtime_resume(struct device *dev)
2497 2497 {
2498 2498 struct max98090_priv *max98090 = dev_get_drvdata(dev);
sound/soc/codecs/pcm512x.c
Diff comments   View file @ 035f10e
... ... @@ -517,7 +517,7 @@
517 517 }
518 518 EXPORT_SYMBOL_GPL(pcm512x_remove);
519 519  
520   -#ifdef CONFIG_PM_RUNTIME
  520 +#ifdef CONFIG_PM
521 521 static int pcm512x_suspend(struct device *dev)
522 522 {
523 523 struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
sound/soc/codecs/tas2552.c
Diff comments   View file @ 035f10e
... ... @@ -115,7 +115,7 @@
115 115 {"ClassD", NULL, "PLL"},
116 116 };
117 117  
118   -#ifdef CONFIG_PM_RUNTIME
  118 +#ifdef CONFIG_PM
119 119 static void tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown)
120 120 {
121 121 u8 cfg1_reg;
... ... @@ -264,7 +264,7 @@
264 264 return 0;
265 265 }
266 266  
267   -#ifdef CONFIG_PM_RUNTIME
  267 +#ifdef CONFIG_PM
268 268 static int tas2552_runtime_suspend(struct device *dev)
269 269 {
270 270 struct tas2552_data *tas2552 = dev_get_drvdata(dev);
sound/soc/codecs/wm2200.c
Diff comments   View file @ 035f10e
... ... @@ -2440,7 +2440,7 @@
2440 2440 return 0;
2441 2441 }
2442 2442  
2443   -#ifdef CONFIG_PM_RUNTIME
  2443 +#ifdef CONFIG_PM
2444 2444 static int wm2200_runtime_suspend(struct device *dev)
2445 2445 {
2446 2446 struct wm2200_priv *wm2200 = dev_get_drvdata(dev);
sound/soc/codecs/wm5100.c
Diff comments   View file @ 035f10e
... ... @@ -2664,7 +2664,7 @@
2664 2664 return 0;
2665 2665 }
2666 2666  
2667   -#ifdef CONFIG_PM_RUNTIME
  2667 +#ifdef CONFIG_PM
2668 2668 static int wm5100_runtime_suspend(struct device *dev)
2669 2669 {
2670 2670 struct wm5100_priv *wm5100 = dev_get_drvdata(dev);
sound/soc/codecs/wm8962.c
Diff comments   View file @ 035f10e
... ... @@ -3782,7 +3782,7 @@
3782 3782 return 0;
3783 3783 }
3784 3784  
3785   -#ifdef CONFIG_PM_RUNTIME
  3785 +#ifdef CONFIG_PM
3786 3786 static int wm8962_runtime_resume(struct device *dev)
3787 3787 {
3788 3788 struct wm8962_priv *wm8962 = dev_get_drvdata(dev);
sound/soc/fsl/fsl_asrc.c
Diff comments   View file @ 035f10e
... ... @@ -928,7 +928,7 @@
928 928 return 0;
929 929 }
930 930  
931   -#ifdef CONFIG_PM_RUNTIME
  931 +#ifdef CONFIG_PM
932 932 static int fsl_asrc_runtime_resume(struct device *dev)
933 933 {
934 934 struct fsl_asrc *asrc_priv = dev_get_drvdata(dev);
... ... @@ -954,7 +954,7 @@
954 954  
955 955 return 0;
956 956 }
957   -#endif /* CONFIG_PM_RUNTIME */
  957 +#endif /* CONFIG_PM */
958 958  
959 959 #ifdef CONFIG_PM_SLEEP
960 960 static int fsl_asrc_suspend(struct device *dev)
sound/soc/samsung/i2s.c
Diff comments   View file @ 035f10e
... ... @@ -1113,7 +1113,7 @@
1113 1113 platform_get_device_id(pdev)->driver_data;
1114 1114 }
1115 1115  
1116   -#ifdef CONFIG_PM_RUNTIME
  1116 +#ifdef CONFIG_PM
1117 1117 static int i2s_runtime_suspend(struct device *dev)
1118 1118 {
1119 1119 struct i2s_dai *i2s = dev_get_drvdata(dev);
... ... @@ -1131,7 +1131,7 @@
1131 1131  
1132 1132 return 0;
1133 1133 }
1134   -#endif /* CONFIG_PM_RUNTIME */
  1134 +#endif /* CONFIG_PM */
1135 1135  
1136 1136 static int samsung_i2s_probe(struct platform_device *pdev)
1137 1137 {