diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/device.h | 4 | ||||
-rw-r--r-- | include/linux/pm.h | 2 | ||||
-rw-r--r-- | include/linux/pm_runtime.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index e4f62d8896b7..160d4ddb2499 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -516,7 +516,7 @@ struct device_dma_parameters { | |||
516 | * minimizes board-specific #ifdefs in drivers. | 516 | * minimizes board-specific #ifdefs in drivers. |
517 | * @power: For device power management. | 517 | * @power: For device power management. |
518 | * See Documentation/power/devices.txt for details. | 518 | * See Documentation/power/devices.txt for details. |
519 | * @pwr_domain: Provide callbacks that are executed during system suspend, | 519 | * @pm_domain: Provide callbacks that are executed during system suspend, |
520 | * hibernation, system resume and during runtime PM transitions | 520 | * hibernation, system resume and during runtime PM transitions |
521 | * along with subsystem-level and driver-level callbacks. | 521 | * along with subsystem-level and driver-level callbacks. |
522 | * @numa_node: NUMA node this device is close to. | 522 | * @numa_node: NUMA node this device is close to. |
@@ -567,7 +567,7 @@ struct device { | |||
567 | void *platform_data; /* Platform specific data, device | 567 | void *platform_data; /* Platform specific data, device |
568 | core doesn't touch it */ | 568 | core doesn't touch it */ |
569 | struct dev_pm_info power; | 569 | struct dev_pm_info power; |
570 | struct dev_power_domain *pwr_domain; | 570 | struct dev_pm_domain *pm_domain; |
571 | 571 | ||
572 | #ifdef CONFIG_NUMA | 572 | #ifdef CONFIG_NUMA |
573 | int numa_node; /* NUMA node this device is close to */ | 573 | int numa_node; /* NUMA node this device is close to */ |
diff --git a/include/linux/pm.h b/include/linux/pm.h index 411e4f4be52b..e3963208aa93 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
@@ -472,7 +472,7 @@ extern void update_pm_runtime_accounting(struct device *dev); | |||
472 | * hibernation, system resume and during runtime PM transitions along with | 472 | * hibernation, system resume and during runtime PM transitions along with |
473 | * subsystem-level and driver-level callbacks. | 473 | * subsystem-level and driver-level callbacks. |
474 | */ | 474 | */ |
475 | struct dev_power_domain { | 475 | struct dev_pm_domain { |
476 | struct dev_pm_ops ops; | 476 | struct dev_pm_ops ops; |
477 | }; | 477 | }; |
478 | 478 | ||
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 878cf84baeb1..ef91904c7110 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h | |||
@@ -247,7 +247,7 @@ static inline void pm_runtime_dont_use_autosuspend(struct device *dev) | |||
247 | 247 | ||
248 | struct pm_clk_notifier_block { | 248 | struct pm_clk_notifier_block { |
249 | struct notifier_block nb; | 249 | struct notifier_block nb; |
250 | struct dev_power_domain *pwr_domain; | 250 | struct dev_pm_domain *pm_domain; |
251 | char *con_ids[]; | 251 | char *con_ids[]; |
252 | }; | 252 | }; |
253 | 253 | ||