diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-21 14:33:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-21 14:33:43 +0200 |
| commit | 9215ad71f587b86bd31c214b4016e1f16c48d13a (patch) | |
| tree | 741701f7405194fb1de4176f72a6fd38e33e8c78 | |
| parent | e317c6efef88d4b40744020ff103418d5bbb666f (diff) | |
| download | alsa-driver-build-unstable-9215ad71f587b86bd31c214b4016e1f16c48d13a.tar.gz | |
Define pm_runtime_active() wrapper at the right place
... instead of inside ifdef for 2.6.34.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/include/adriver.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/alsa/include/adriver.h b/alsa/include/adriver.h index ada4c1038..0a79b8d0c 100644 --- a/alsa/include/adriver.h +++ b/alsa/include/adriver.h @@ -754,10 +754,6 @@ static inline int pm_runtime_get_sync(struct device *dev) { return 1; } static inline int pm_runtime_put_sync(struct device *dev) { return -ENOSYS; } #endif /* < 2.6.32 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -#define pm_runtime_active(dev) ((dev)->power.runtime_status == RPM_ACTIVE) -#endif /* < 3.9.0 */ - static inline int pci_dev_run_wake(struct pci_dev *dev) { return 1; } #ifndef SET_SYSTEM_SLEEP_PM_OPS @@ -780,6 +776,10 @@ static inline int pci_dev_run_wake(struct pci_dev *dev) { return 1; } #endif #endif /* < 2.6.34 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) +#define pm_runtime_active(dev) ((dev)->power.runtime_status == RPM_ACTIVE) +#endif /* < 3.9.0 */ + /* wrapper for getnstimeofday() * it's needed for recent 2.6 kernels, too, due to lack of EXPORT_SYMBOL */ |