diff options
Diffstat (limited to 'drivers/misc/mei/pci-txe.c')
-rw-r--r-- | drivers/misc/mei/pci-txe.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index bee1c6fb7e75..1f572deacf54 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c | |||
@@ -42,13 +42,13 @@ static const struct pci_device_id mei_txe_pci_tbl[] = { | |||
42 | }; | 42 | }; |
43 | MODULE_DEVICE_TABLE(pci, mei_txe_pci_tbl); | 43 | MODULE_DEVICE_TABLE(pci, mei_txe_pci_tbl); |
44 | 44 | ||
45 | #ifdef CONFIG_PM_RUNTIME | 45 | #ifdef CONFIG_PM |
46 | static inline void mei_txe_set_pm_domain(struct mei_device *dev); | 46 | static inline void mei_txe_set_pm_domain(struct mei_device *dev); |
47 | static inline void mei_txe_unset_pm_domain(struct mei_device *dev); | 47 | static inline void mei_txe_unset_pm_domain(struct mei_device *dev); |
48 | #else | 48 | #else |
49 | static inline void mei_txe_set_pm_domain(struct mei_device *dev) {} | 49 | static inline void mei_txe_set_pm_domain(struct mei_device *dev) {} |
50 | static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {} | 50 | static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {} |
51 | #endif /* CONFIG_PM_RUNTIME */ | 51 | #endif /* CONFIG_PM */ |
52 | 52 | ||
53 | static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw) | 53 | static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw) |
54 | { | 54 | { |
@@ -295,7 +295,7 @@ static int mei_txe_pci_resume(struct device *device) | |||
295 | } | 295 | } |
296 | #endif /* CONFIG_PM_SLEEP */ | 296 | #endif /* CONFIG_PM_SLEEP */ |
297 | 297 | ||
298 | #ifdef CONFIG_PM_RUNTIME | 298 | #ifdef CONFIG_PM |
299 | static int mei_txe_pm_runtime_idle(struct device *device) | 299 | static int mei_txe_pm_runtime_idle(struct device *device) |
300 | { | 300 | { |
301 | struct pci_dev *pdev = to_pci_dev(device); | 301 | struct pci_dev *pdev = to_pci_dev(device); |
@@ -401,9 +401,7 @@ static inline void mei_txe_unset_pm_domain(struct mei_device *dev) | |||
401 | /* stop using pm callbacks if any */ | 401 | /* stop using pm callbacks if any */ |
402 | dev->dev->pm_domain = NULL; | 402 | dev->dev->pm_domain = NULL; |
403 | } | 403 | } |
404 | #endif /* CONFIG_PM_RUNTIME */ | ||
405 | 404 | ||
406 | #ifdef CONFIG_PM | ||
407 | static const struct dev_pm_ops mei_txe_pm_ops = { | 405 | static const struct dev_pm_ops mei_txe_pm_ops = { |
408 | SET_SYSTEM_SLEEP_PM_OPS(mei_txe_pci_suspend, | 406 | SET_SYSTEM_SLEEP_PM_OPS(mei_txe_pci_suspend, |
409 | mei_txe_pci_resume) | 407 | mei_txe_pci_resume) |