Merge tag 'fsnotify_for_v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / linux / pm_domain.h

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 9ec78ee..ee11502 100644 (file)
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -95,8 +95,8 @@ struct generic_pm_domain {
        struct device dev;
        struct dev_pm_domain domain;    /* PM domain operations */
        struct list_head gpd_list_node; /* Node in the global PM domains list */
-       struct list_head master_links;  /* Links with PM domain as a master */
-       struct list_head slave_links;   /* Links with PM domain as a slave */
+       struct list_head parent_links;  /* Links with PM domain as a parent */
+       struct list_head child_links;   /* Links with PM domain as a child */
        struct list_head dev_list;      /* List of devices */
        struct dev_power_governor *gov;
        struct work_struct power_off_work;
@@ -151,10 +151,10 @@ static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)
 }
 
 struct gpd_link {
-       struct generic_pm_domain *master;
-       struct list_head master_node;
-       struct generic_pm_domain *slave;
-       struct list_head slave_node;
+       struct generic_pm_domain *parent;
+       struct list_head parent_node;
+       struct generic_pm_domain *child;
+       struct list_head child_node;
 
        /* Sub-domain's per-master domain performance state */
        unsigned int performance_state;