diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:44:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:44:05 +0100 |
| commit | 035f10ee4e978db0a01d0f832e328b4a62f8310e (patch) | |
| tree | f9c8e95958c24450c37c27b789ac84513b6c6ff1 /include | |
| parent | 0a0666428680c4a68d050491d5323a2ef05e08a7 (diff) | |
| parent | f2ea5e1708da1bd7cb11c2cd967071e23ec9e347 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pm.h | 2 | ||||
| -rw-r--r-- | include/scsi/scsi_device.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 66a656eb335b..8b5976364619 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -351,8 +351,6 @@ struct dev_pm_ops { #define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) #endif -#define SET_PM_RUNTIME_PM_OPS SET_RUNTIME_PM_OPS - /* * Use this if you want to use the same suspend and resume callbacks for suspend * to RAM and hibernation. diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 6364e23454dd..3a4edd1f7dbb 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -441,13 +441,13 @@ static inline int scsi_execute_req(struct scsi_device *sdev, extern void sdev_disable_disk_events(struct scsi_device *sdev); extern void sdev_enable_disk_events(struct scsi_device *sdev); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM extern int scsi_autopm_get_device(struct scsi_device *); extern void scsi_autopm_put_device(struct scsi_device *); #else static inline int scsi_autopm_get_device(struct scsi_device *d) { return 0; } static inline void scsi_autopm_put_device(struct scsi_device *d) {} -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev) { |