Skip to content

Commit 035f10e

Browse files
rafaeljwrafaeljw
committed
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
2 parents 0a06664 + f2ea5e1 commit 035f10e

Some content is hidden

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

53 files changed

+68
-97
lines changed

‎arch/arm/kernel/perf_event.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu)
484484
armpmu->stop(armpmu);
485485
}
486486

487-
#ifdef CONFIG_PM_RUNTIME
487+
#ifdef CONFIG_PM
488488
static int armpmu_runtime_resume(struct device *dev)
489489
{
490490
struct arm_pmu_platdata *plat = dev_get_platdata(dev);

‎arch/arm/mach-davinci/pm_domain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/pm_clock.h>
1515
#include <linux/platform_device.h>
1616

17-
#ifdef CONFIG_PM_RUNTIME
17+
#ifdef CONFIG_PM
1818
static int davinci_pm_runtime_suspend(struct device *dev)
1919
{
2020
int ret;

‎arch/arm/mach-exynos/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS
2121
select HAVE_S3C_RTC if RTC_CLASS
2222
select PINCTRL
2323
select PINCTRL_EXYNOS
24-
select PM_GENERIC_DOMAINS if PM_RUNTIME
24+
select PM_GENERIC_DOMAINS if PM
2525
select S5P_DEV_MFC
2626
select SRAM
2727
select MFD_SYSCON

‎arch/arm/mach-keystone/pm_domain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <linux/clk-provider.h>
2020
#include <linux/of.h>
2121

22-
#ifdef CONFIG_PM_RUNTIME
22+
#ifdef CONFIG_PM
2323
static int keystone_pm_runtime_suspend(struct device *dev)
2424
{
2525
int ret;

‎arch/arm/mach-omap1/pm_bus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "soc.h"
2323

24-
#ifdef CONFIG_PM_RUNTIME
24+
#ifdef CONFIG_PM
2525
static int omap1_pm_runtime_suspend(struct device *dev)
2626
{
2727
int ret;
@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = {
5959
#define OMAP1_PM_DOMAIN (&default_pm_domain)
6060
#else
6161
#define OMAP1_PM_DOMAIN NULL
62-
#endif /* CONFIG_PM_RUNTIME */
62+
#endif /* CONFIG_PM */
6363

6464
static struct pm_clk_notifier_block platform_bus_notifier = {
6565
.pm_domain = OMAP1_PM_DOMAIN,

‎arch/arm/mach-omap2/io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ static void __init omap_hwmod_init_postsetup(void)
361361
u8 postsetup_state;
362362

363363
/* Set the default postsetup state for all hwmods */
364-
#ifdef CONFIG_PM_RUNTIME
364+
#ifdef CONFIG_PM
365365
postsetup_state = _HWMOD_STATE_IDLE;
366366
#else
367367
postsetup_state = _HWMOD_STATE_ENABLED;

‎arch/arm/mach-omap2/omap_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name,
588588
return ERR_PTR(ret);
589589
}
590590

591-
#ifdef CONFIG_PM_RUNTIME
591+
#ifdef CONFIG_PM
592592
static int _od_runtime_suspend(struct device *dev)
593593
{
594594
struct platform_device *pdev = to_platform_device(dev);

‎arch/ia64/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ config IA64_SGI_UV
232232
config IA64_HP_SIM
233233
bool "Ski-simulator"
234234
select SWIOTLB
235-
depends on !PM_RUNTIME
235+
depends on !PM
236236

237237
endchoice
238238

‎arch/x86/kernel/apic/io_apic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3968,7 +3968,7 @@ bool mp_should_keep_irq(struct device *dev)
39683968
{
39693969
if (dev->power.is_prepared)
39703970
return true;
3971-
#ifdef CONFIG_PM_RUNTIME
3971+
#ifdef CONFIG_PM
39723972
if (dev->power.runtime_status == RPM_SUSPENDING)
39733973
return true;
39743974
#endif

‎drivers/ata/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ config ATA_ACPI
6161

6262
config SATA_ZPODD
6363
bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
64-
depends on ATA_ACPI && PM_RUNTIME
64+
depends on ATA_ACPI && PM
6565
default n
6666
help
6767
This option adds support for SATA Zero Power Optical Disc

‎drivers/media/platform/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ config VIDEO_OMAP3_DEBUG
112112
config VIDEO_S3C_CAMIF
113113
tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
114114
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
115-
depends on PM_RUNTIME
115+
depends on PM
116116
depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
117117
depends on HAS_DMA
118118
select VIDEOBUF2_DMA_CONTIG

‎drivers/media/platform/s5p-tv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
config VIDEO_SAMSUNG_S5P_TV
1010
bool "Samsung TV driver for S5P platform"
11-
depends on PM_RUNTIME
11+
depends on PM
1212
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
1313
default n
1414
---help---

‎drivers/mmc/host/atmel-mci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2561,7 +2561,7 @@ static int atmci_runtime_resume(struct device *dev)
25612561
static const struct dev_pm_ops atmci_dev_pm_ops = {
25622562
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
25632563
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)
25652565
};
25662566

25672567
static struct platform_driver atmci_driver = {

‎drivers/nfc/trf7970a.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device *dev)
21542154
}
21552155
#endif
21562156

2157-
#ifdef CONFIG_PM_RUNTIME
2157+
#ifdef CONFIG_PM
21582158
static int trf7970a_pm_runtime_suspend(struct device *dev)
21592159
{
21602160
struct spi_device *spi = container_of(dev, struct spi_device, dev);

‎drivers/phy/phy-omap-usb2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ static int omap_usb2_remove(struct platform_device *pdev)
322322
return 0;
323323
}
324324

325-
#ifdef CONFIG_PM_RUNTIME
325+
#ifdef CONFIG_PM
326326

327327
static int omap_usb2_runtime_suspend(struct device *dev)
328328
{

‎drivers/phy/phy-ti-pipe3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static int ti_pipe3_remove(struct platform_device *pdev)
423423
return 0;
424424
}
425425

426-
#ifdef CONFIG_PM_RUNTIME
426+
#ifdef CONFIG_PM
427427

428428
static int ti_pipe3_runtime_suspend(struct device *dev)
429429
{

‎drivers/power/pm2301_charger.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,8 +951,6 @@ static int pm2xxx_wall_charger_suspend(struct device *dev)
951951

952952
#endif
953953

954-
#ifdef CONFIG_PM_RUNTIME
955-
956954
static int pm2xxx_runtime_suspend(struct device *dev)
957955
{
958956
struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
@@ -977,8 +975,6 @@ static int pm2xxx_runtime_resume(struct device *dev)
977975
return 0;
978976
}
979977

980-
#endif
981-
982978
static const struct dev_pm_ops pm2xxx_pm_ops = {
983979
SET_SYSTEM_SLEEP_PM_OPS(pm2xxx_wall_charger_suspend,
984980
pm2xxx_wall_charger_resume)

‎drivers/scsi/scsi_pm.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ static int scsi_bus_restore(struct device *dev)
213213

214214
#endif /* CONFIG_PM_SLEEP */
215215

216-
#ifdef CONFIG_PM_RUNTIME
217-
218216
static int sdev_runtime_suspend(struct device *dev)
219217
{
220218
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
@@ -332,14 +330,6 @@ void scsi_autopm_put_host(struct Scsi_Host *shost)
332330
pm_runtime_put_sync(&shost->shost_gendev);
333331
}
334332

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-
343333
const struct dev_pm_ops scsi_bus_pm_ops = {
344334
.prepare = scsi_bus_prepare,
345335
.suspend = scsi_bus_suspend,

‎drivers/scsi/scsi_priv.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ static inline void scsi_netlink_exit(void) {}
155155
/* scsi_pm.c */
156156
#ifdef CONFIG_PM
157157
extern const struct dev_pm_ops scsi_bus_pm_ops;
158-
#endif
159-
#ifdef CONFIG_PM_RUNTIME
158+
160159
extern void scsi_autopm_get_target(struct scsi_target *);
161160
extern void scsi_autopm_put_target(struct scsi_target *);
162161
extern int scsi_autopm_get_host(struct Scsi_Host *);
@@ -166,7 +165,7 @@ static inline void scsi_autopm_get_target(struct scsi_target *t) {}
166165
static inline void scsi_autopm_put_target(struct scsi_target *t) {}
167166
static inline int scsi_autopm_get_host(struct Scsi_Host *h) { return 0; }
168167
static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}
169-
#endif /* CONFIG_PM_RUNTIME */
168+
#endif /* CONFIG_PM */
170169

171170
extern struct async_domain scsi_sd_pm_domain;
172171
extern struct async_domain scsi_sd_probe_domain;

‎drivers/scsi/ufs/ufshcd-pci.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@ static int ufshcd_pci_resume(struct device *dev)
6262
{
6363
return ufshcd_system_resume(dev_get_drvdata(dev));
6464
}
65-
#else
66-
#define ufshcd_pci_suspend NULL
67-
#define ufshcd_pci_resume NULL
68-
#endif /* CONFIG_PM */
6965

70-
#ifdef CONFIG_PM_RUNTIME
7166
static int ufshcd_pci_runtime_suspend(struct device *dev)
7267
{
7368
return ufshcd_runtime_suspend(dev_get_drvdata(dev));
@@ -80,11 +75,13 @@ static int ufshcd_pci_runtime_idle(struct device *dev)
8075
{
8176
return ufshcd_runtime_idle(dev_get_drvdata(dev));
8277
}
83-
#else /* !CONFIG_PM_RUNTIME */
78+
#else /* !CONFIG_PM */
79+
#define ufshcd_pci_suspend NULL
80+
#define ufshcd_pci_resume NULL
8481
#define ufshcd_pci_runtime_suspend NULL
8582
#define ufshcd_pci_runtime_resume NULL
8683
#define ufshcd_pci_runtime_idle NULL
87-
#endif /* CONFIG_PM_RUNTIME */
84+
#endif /* CONFIG_PM */
8885

8986
/**
9087
* ufshcd_pci_shutdown - main function to put the controller in reset state

‎drivers/scsi/ufs/ufshcd-pltfrm.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,7 @@ static int ufshcd_pltfrm_resume(struct device *dev)
261261
{
262262
return ufshcd_system_resume(dev_get_drvdata(dev));
263263
}
264-
#else
265-
#define ufshcd_pltfrm_suspend NULL
266-
#define ufshcd_pltfrm_resume NULL
267-
#endif
268264

269-
#ifdef CONFIG_PM_RUNTIME
270265
static int ufshcd_pltfrm_runtime_suspend(struct device *dev)
271266
{
272267
return ufshcd_runtime_suspend(dev_get_drvdata(dev));
@@ -279,11 +274,13 @@ static int ufshcd_pltfrm_runtime_idle(struct device *dev)
279274
{
280275
return ufshcd_runtime_idle(dev_get_drvdata(dev));
281276
}
282-
#else /* !CONFIG_PM_RUNTIME */
277+
#else /* !CONFIG_PM */
278+
#define ufshcd_pltfrm_suspend NULL
279+
#define ufshcd_pltfrm_resume NULL
283280
#define ufshcd_pltfrm_runtime_suspend NULL
284281
#define ufshcd_pltfrm_runtime_resume NULL
285282
#define ufshcd_pltfrm_runtime_idle NULL
286-
#endif /* CONFIG_PM_RUNTIME */
283+
#endif /* CONFIG_PM */
287284

288285
static void ufshcd_pltfrm_shutdown(struct platform_device *pdev)
289286
{

‎drivers/spi/spi-coldfire-qspi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static int mcfqspi_resume(struct device *dev)
491491
}
492492
#endif
493493

494-
#ifdef CONFIG_PM_RUNTIME
494+
#ifdef CONFIG_PM
495495
static int mcfqspi_runtime_suspend(struct device *dev)
496496
{
497497
struct spi_master *master = dev_get_drvdata(dev);

‎drivers/spi/spi-orion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static int orion_spi_remove(struct platform_device *pdev)
523523

524524
MODULE_ALIAS("platform:" DRIVER_NAME);
525525

526-
#ifdef CONFIG_PM_RUNTIME
526+
#ifdef CONFIG_PM
527527
static int orion_spi_runtime_suspend(struct device *dev)
528528
{
529529
struct spi_master *master = dev_get_drvdata(dev);

‎drivers/spi/spi-pxa2xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ static int pxa2xx_spi_resume(struct device *dev)
13071307
}
13081308
#endif
13091309

1310-
#ifdef CONFIG_PM_RUNTIME
1310+
#ifdef CONFIG_PM
13111311
static int pxa2xx_spi_runtime_suspend(struct device *dev)
13121312
{
13131313
struct driver_data *drv_data = dev_get_drvdata(dev);

‎drivers/spi/spi-qup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ static int spi_qup_probe(struct platform_device *pdev)
646646
return ret;
647647
}
648648

649-
#ifdef CONFIG_PM_RUNTIME
649+
#ifdef CONFIG_PM
650650
static int spi_qup_pm_suspend_runtime(struct device *device)
651651
{
652652
struct spi_master *master = dev_get_drvdata(device);
@@ -672,7 +672,7 @@ static int spi_qup_pm_resume_runtime(struct device *device)
672672
writel_relaxed(config, controller->base + QUP_CONFIG);
673673
return 0;
674674
}
675-
#endif /* CONFIG_PM_RUNTIME */
675+
#endif /* CONFIG_PM */
676676

677677
#ifdef CONFIG_PM_SLEEP
678678
static int spi_qup_suspend(struct device *device)

‎drivers/spi/spi-rockchip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ static int rockchip_spi_resume(struct device *dev)
801801
}
802802
#endif /* CONFIG_PM_SLEEP */
803803

804-
#ifdef CONFIG_PM_RUNTIME
804+
#ifdef CONFIG_PM
805805
static int rockchip_spi_runtime_suspend(struct device *dev)
806806
{
807807
struct spi_master *master = dev_get_drvdata(dev);
@@ -829,7 +829,7 @@ static int rockchip_spi_runtime_resume(struct device *dev)
829829

830830
return ret;
831831
}
832-
#endif /* CONFIG_PM_RUNTIME */
832+
#endif /* CONFIG_PM */
833833

834834
static const struct dev_pm_ops rockchip_spi_pm = {
835835
SET_SYSTEM_SLEEP_PM_OPS(rockchip_spi_suspend, rockchip_spi_resume)

‎drivers/spi/spi-s3c64xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ static int s3c64xx_spi_resume(struct device *dev)
12661266
}
12671267
#endif /* CONFIG_PM_SLEEP */
12681268

1269-
#ifdef CONFIG_PM_RUNTIME
1269+
#ifdef CONFIG_PM
12701270
static int s3c64xx_spi_runtime_suspend(struct device *dev)
12711271
{
12721272
struct spi_master *master = dev_get_drvdata(dev);
@@ -1296,7 +1296,7 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
12961296

12971297
return 0;
12981298
}
1299-
#endif /* CONFIG_PM_RUNTIME */
1299+
#endif /* CONFIG_PM */
13001300

13011301
static const struct dev_pm_ops s3c64xx_spi_pm = {
13021302
SET_SYSTEM_SLEEP_PM_OPS(s3c64xx_spi_suspend, s3c64xx_spi_resume)

‎drivers/staging/gdm72xx/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if WIMAX_GDM72XX_USB
5353

5454
config WIMAX_GDM72XX_USB_PM
5555
bool "Enable power management support"
56-
depends on PM_RUNTIME
56+
depends on PM
5757
help
5858
Enable USB power management in order to reduce power consumption
5959
while the interface is not in use.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ static int dw8250_resume(struct device *dev)
489489
}
490490
#endif /* CONFIG_PM_SLEEP */
491491

492-
#ifdef CONFIG_PM_RUNTIME
492+
#ifdef CONFIG_PM
493493
static int dw8250_runtime_suspend(struct device *dev)
494494
{
495495
struct dw8250_data *data = dev_get_drvdata(dev);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static int mtk8250_resume(struct device *dev)
244244
}
245245
#endif /* CONFIG_PM_SLEEP */
246246

247-
#ifdef CONFIG_PM_RUNTIME
247+
#ifdef CONFIG_PM
248248
static int mtk8250_runtime_suspend(struct device *dev)
249249
{
250250
struct mtk8250_data *data = dev_get_drvdata(dev);

0 commit comments

Comments
 (0)