PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain

The naming convention used by commit 7538e3db6e015e890825fbd9f86599b
(PM: Add support for device power domains), which introduced the
struct dev_power_domain type for representing device power domains,
evidently confuses some developers who tend to think that objects
of this type must correspond to "power domains" as defined by
hardware, which is not the case.  Namely, at the kernel level, a
struct dev_power_domain object can represent arbitrary set of devices
that are mutually dependent power management-wise and need not belong
to one hardware power domain.  To avoid that confusion, rename struct
dev_power_domain to struct dev_pm_domain and rename the related
pointers in struct device and struct pm_clk_notifier_block from
pwr_domain to pm_domain.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Kevin Hilman <khilman@ti.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/sh/kernel/cpu/shmobile/pm_runtime.c b/arch/sh/kernel/cpu/shmobile/pm_runtime.c
index 64c807c39208..bf280c812d2f 100644
--- a/arch/sh/kernel/cpu/shmobile/pm_runtime.c
+++ b/arch/sh/kernel/cpu/shmobile/pm_runtime.c
@@ -256,7 +256,7 @@ out:
         return ret;
 }
 
-static struct dev_power_domain default_power_domain = {
+static struct dev_pm_domain default_pm_domain = {
         .ops = {
                 .runtime_suspend = default_platform_runtime_suspend,
                 .runtime_resume = default_platform_runtime_resume,
@@ -285,7 +285,7 @@ static int platform_bus_notify(struct notifier_block *nb,
                 hwblk_disable(hwblk_info, hwblk);
                 /* make sure driver re-inits itself once */
                 __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
-                dev->pwr_domain = &default_power_domain;
+                dev->pm_domain = &default_pm_domain;
                 break;
         /* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */
         case BUS_NOTIFY_BOUND_DRIVER:
@@ -299,7 +299,7 @@ static int platform_bus_notify(struct notifier_block *nb,
                 __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
                 break;
         case BUS_NOTIFY_DEL_DEVICE:
-                dev->pwr_domain = NULL;
+                dev->pm_domain = NULL;
                 break;
         }
         return 0;