aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-06-22 19:52:55 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2011-07-02 08:29:54 -0400
commit564b905ab10d17fb42f86aa8b7b9b796276d1336 (patch)
treeb191c000e55ae1a354bd67876ca6945d2ad87c93 /arch/arm/mach-shmobile
parentf5da24dbed213d103f00aa9ef26e010b50d2db24 (diff)
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/pm_runtime.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/pm_runtime.c b/arch/arm/mach-shmobile/pm_runtime.c
index 2d1b67a59e4a..99802d28e5d3 100644
--- a/arch/arm/mach-shmobile/pm_runtime.c
+++ b/arch/arm/mach-shmobile/pm_runtime.c
@@ -28,7 +28,7 @@ static int default_platform_runtime_idle(struct device *dev)
28 return pm_runtime_suspend(dev); 28 return pm_runtime_suspend(dev);
29} 29}
30 30
31static struct dev_power_domain default_power_domain = { 31static struct dev_pm_domain default_pm_domain = {
32 .ops = { 32 .ops = {
33 .runtime_suspend = pm_runtime_clk_suspend, 33 .runtime_suspend = pm_runtime_clk_suspend,
34 .runtime_resume = pm_runtime_clk_resume, 34 .runtime_resume = pm_runtime_clk_resume,
@@ -37,16 +37,16 @@ static struct dev_power_domain default_power_domain = {
37 }, 37 },
38}; 38};
39 39
40#define DEFAULT_PWR_DOMAIN_PTR (&default_power_domain) 40#define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
41 41
42#else 42#else
43 43
44#define DEFAULT_PWR_DOMAIN_PTR NULL 44#define DEFAULT_PM_DOMAIN_PTR NULL
45 45
46#endif /* CONFIG_PM_RUNTIME */ 46#endif /* CONFIG_PM_RUNTIME */
47 47
48static struct pm_clk_notifier_block platform_bus_notifier = { 48static struct pm_clk_notifier_block platform_bus_notifier = {
49 .pwr_domain = DEFAULT_PWR_DOMAIN_PTR, 49 .pm_domain = DEFAULT_PM_DOMAIN_PTR,
50 .con_ids = { NULL, }, 50 .con_ids = { NULL, },
51}; 51};
52 52