diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/power/power.h | 13 | ||||
-rw-r--r-- | drivers/usb/core/hub.c | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index 2e700d795cf1..fb3d35a9e101 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h | |||
@@ -67,9 +67,6 @@ extern int suspend_device(struct device *, pm_message_t); | |||
67 | * runtime.c | 67 | * runtime.c |
68 | */ | 68 | */ |
69 | 69 | ||
70 | extern int dpm_runtime_suspend(struct device *, pm_message_t); | ||
71 | extern void dpm_runtime_resume(struct device *); | ||
72 | |||
73 | #else /* CONFIG_PM */ | 70 | #else /* CONFIG_PM */ |
74 | 71 | ||
75 | 72 | ||
@@ -82,14 +79,4 @@ static inline void device_pm_remove(struct device * dev) | |||
82 | 79 | ||
83 | } | 80 | } |
84 | 81 | ||
85 | static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state) | ||
86 | { | ||
87 | return 0; | ||
88 | } | ||
89 | |||
90 | static inline void dpm_runtime_resume(struct device * dev) | ||
91 | { | ||
92 | |||
93 | } | ||
94 | |||
95 | #endif | 82 | #endif |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 1bacb374b007..9660a8909b7c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -2652,8 +2652,6 @@ static void hub_events(void) | |||
2652 | * stub "device" node was never suspended. | 2652 | * stub "device" node was never suspended. |
2653 | */ | 2653 | */ |
2654 | if (i) { | 2654 | if (i) { |
2655 | extern void dpm_runtime_resume(struct device *); | ||
2656 | |||
2657 | dpm_runtime_resume(&hdev->dev); | 2655 | dpm_runtime_resume(&hdev->dev); |
2658 | dpm_runtime_resume(&intf->dev); | 2656 | dpm_runtime_resume(&intf->dev); |
2659 | } | 2657 | } |