diff options
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
-rw-r--r-- | drivers/misc/mei/pci-me.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index f3225b1643ab..cf20d397068a 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c | |||
@@ -89,13 +89,13 @@ static const struct pci_device_id mei_me_pci_tbl[] = { | |||
89 | 89 | ||
90 | MODULE_DEVICE_TABLE(pci, mei_me_pci_tbl); | 90 | MODULE_DEVICE_TABLE(pci, mei_me_pci_tbl); |
91 | 91 | ||
92 | #ifdef CONFIG_PM_RUNTIME | 92 | #ifdef CONFIG_PM |
93 | static inline void mei_me_set_pm_domain(struct mei_device *dev); | 93 | static inline void mei_me_set_pm_domain(struct mei_device *dev); |
94 | static inline void mei_me_unset_pm_domain(struct mei_device *dev); | 94 | static inline void mei_me_unset_pm_domain(struct mei_device *dev); |
95 | #else | 95 | #else |
96 | static inline void mei_me_set_pm_domain(struct mei_device *dev) {} | 96 | static inline void mei_me_set_pm_domain(struct mei_device *dev) {} |
97 | static inline void mei_me_unset_pm_domain(struct mei_device *dev) {} | 97 | static inline void mei_me_unset_pm_domain(struct mei_device *dev) {} |
98 | #endif /* CONFIG_PM_RUNTIME */ | 98 | #endif /* CONFIG_PM */ |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * mei_me_quirk_probe - probe for devices that doesn't valid ME interface | 101 | * mei_me_quirk_probe - probe for devices that doesn't valid ME interface |
@@ -357,7 +357,7 @@ static int mei_me_pci_resume(struct device *device) | |||
357 | } | 357 | } |
358 | #endif /* CONFIG_PM_SLEEP */ | 358 | #endif /* CONFIG_PM_SLEEP */ |
359 | 359 | ||
360 | #ifdef CONFIG_PM_RUNTIME | 360 | #ifdef CONFIG_PM |
361 | static int mei_me_pm_runtime_idle(struct device *device) | 361 | static int mei_me_pm_runtime_idle(struct device *device) |
362 | { | 362 | { |
363 | struct pci_dev *pdev = to_pci_dev(device); | 363 | struct pci_dev *pdev = to_pci_dev(device); |
@@ -453,9 +453,7 @@ static inline void mei_me_unset_pm_domain(struct mei_device *dev) | |||
453 | /* stop using pm callbacks if any */ | 453 | /* stop using pm callbacks if any */ |
454 | dev->dev->pm_domain = NULL; | 454 | dev->dev->pm_domain = NULL; |
455 | } | 455 | } |
456 | #endif /* CONFIG_PM_RUNTIME */ | ||
457 | 456 | ||
458 | #ifdef CONFIG_PM | ||
459 | static const struct dev_pm_ops mei_me_pm_ops = { | 457 | static const struct dev_pm_ops mei_me_pm_ops = { |
460 | SET_SYSTEM_SLEEP_PM_OPS(mei_me_pci_suspend, | 458 | SET_SYSTEM_SLEEP_PM_OPS(mei_me_pci_suspend, |
461 | mei_me_pci_resume) | 459 | mei_me_pci_resume) |