3 files changed, 28 insertions, 28 deletions

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index ad367c4139b1..c5624818259e 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -278,11 +278,11 @@ int pm_runtime_clk_resume(struct device *dev)
  *
  * For this function to work, @nb must be a member of an object of type
  * struct pm_clk_notifier_block containing all of the requisite data.
- * Specifically, the pwr_domain member of that object is copied to the device's
- * pwr_domain field and its con_ids member is used to populate the device's list
+ * Specifically, the pm_domain member of that object is copied to the device's
+ * pm_domain field and its con_ids member is used to populate the device's list
  * of runtime PM clocks, depending on @action.
  *
- * If the device's pwr_domain field is already populated with a value different
+ * If the device's pm_domain field is already populated with a value different
  * from the one stored in the struct pm_clk_notifier_block object, the function
  * does nothing.
  */
@@ -300,14 +300,14 @@ static int pm_runtime_clk_notify(struct notifier_block *nb,
 
         switch (action) {
         case BUS_NOTIFY_ADD_DEVICE:
-                if (dev->pwr_domain)
+                if (dev->pm_domain)
                         break;
 
                 error = pm_runtime_clk_init(dev);
                 if (error)
                         break;
 
-                dev->pwr_domain = clknb->pwr_domain;
+                dev->pm_domain = clknb->pm_domain;
                 if (clknb->con_ids[0]) {
                         for (con_id = clknb->con_ids; *con_id; con_id++)
                                 pm_runtime_clk_add(dev, *con_id);
@@ -317,10 +317,10 @@ static int pm_runtime_clk_notify(struct notifier_block *nb,
 
                 break;
         case BUS_NOTIFY_DEL_DEVICE:
-                if (dev->pwr_domain != clknb->pwr_domain)
+                if (dev->pm_domain != clknb->pm_domain)
                         break;
 
-                dev->pwr_domain = NULL;
+                dev->pm_domain = NULL;
                 pm_runtime_clk_destroy(dev);
                 break;
         }
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 06f09bf89cb2..85b591a5429a 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -425,9 +425,9 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
         TRACE_DEVICE(dev);
         TRACE_RESUME(0);
 
-        if (dev->pwr_domain) {
+        if (dev->pm_domain) {
                 pm_dev_dbg(dev, state, "EARLY power domain ");
-                error = pm_noirq_op(dev, &dev->pwr_domain->ops, state);
+                error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
         } else if (dev->type && dev->type->pm) {
                 pm_dev_dbg(dev, state, "EARLY type ");
                 error = pm_noirq_op(dev, dev->type->pm, state);
@@ -521,9 +521,9 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
         if (!dev->power.is_suspended)
                 goto Unlock;
 
-        if (dev->pwr_domain) {
+        if (dev->pm_domain) {
                 pm_dev_dbg(dev, state, "power domain ");
-                error = pm_op(dev, &dev->pwr_domain->ops, state);
+                error = pm_op(dev, &dev->pm_domain->ops, state);
                 goto End;
         }
 
@@ -641,10 +641,10 @@ static void device_complete(struct device *dev, pm_message_t state)
 {
         device_lock(dev);
 
-        if (dev->pwr_domain) {
+        if (dev->pm_domain) {
                 pm_dev_dbg(dev, state, "completing power domain ");
-                if (dev->pwr_domain->ops.complete)
-                        dev->pwr_domain->ops.complete(dev);
+                if (dev->pm_domain->ops.complete)
+                        dev->pm_domain->ops.complete(dev);
         } else if (dev->type && dev->type->pm) {
                 pm_dev_dbg(dev, state, "completing type ");
                 if (dev->type->pm->complete)
@@ -744,9 +744,9 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
 {
         int error;
 
-        if (dev->pwr_domain) {
+        if (dev->pm_domain) {
                 pm_dev_dbg(dev, state, "LATE power domain ");
-                error = pm_noirq_op(dev, &dev->pwr_domain->ops, state);
+                error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
                 if (error)
                         return error;
         } else if (dev->type && dev->type->pm) {
@@ -853,9 +853,9 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
                 goto Unlock;
         }
 
-        if (dev->pwr_domain) {
+        if (dev->pm_domain) {
                 pm_dev_dbg(dev, state, "power domain ");
-                error = pm_op(dev, &dev->pwr_domain->ops, state);
+                error = pm_op(dev, &dev->pm_domain->ops, state);
                 goto End;
         }
 
@@ -982,11 +982,11 @@ static int device_prepare(struct device *dev, pm_message_t state)
 
         device_lock(dev);
 
-        if (dev->pwr_domain) {
+        if (dev->pm_domain) {
                 pm_dev_dbg(dev, state, "preparing power domain ");
-                if (dev->pwr_domain->ops.prepare)
-                        error = dev->pwr_domain->ops.prepare(dev);
-                suspend_report_result(dev->pwr_domain->ops.prepare, error);
+                if (dev->pm_domain->ops.prepare)
+                        error = dev->pm_domain->ops.prepare(dev);
+                suspend_report_result(dev->pm_domain->ops.prepare, error);
                 if (error)
                         goto End;
         } else if (dev->type && dev->type->pm) {
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 0d4587b15c55..5f5c4236f006 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -213,8 +213,8 @@ static int rpm_idle(struct device *dev, int rpmflags)
 
         dev->power.idle_notification = true;
 
-        if (dev->pwr_domain)
-                callback = dev->pwr_domain->ops.runtime_idle;
+        if (dev->pm_domain)
+                callback = dev->pm_domain->ops.runtime_idle;
         else if (dev->type && dev->type->pm)
                 callback = dev->type->pm->runtime_idle;
         else if (dev->class && dev->class->pm)
@@ -374,8 +374,8 @@ static int rpm_suspend(struct device *dev, int rpmflags)
 
         __update_runtime_status(dev, RPM_SUSPENDING);
 
-        if (dev->pwr_domain)
-                callback = dev->pwr_domain->ops.runtime_suspend;
+        if (dev->pm_domain)
+                callback = dev->pm_domain->ops.runtime_suspend;
         else if (dev->type && dev->type->pm)
                 callback = dev->type->pm->runtime_suspend;
         else if (dev->class && dev->class->pm)
@@ -573,8 +573,8 @@ static int rpm_resume(struct device *dev, int rpmflags)
 
         __update_runtime_status(dev, RPM_RESUMING);
 
-        if (dev->pwr_domain)
-                callback = dev->pwr_domain->ops.runtime_resume;
+        if (dev->pm_domain)
+                callback = dev->pm_domain->ops.runtime_resume;
         else if (dev->type && dev->type->pm)
                 callback = dev->type->pm->runtime_resume;
         else if (dev->class && dev->class->pm)