diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-03-02 14:24:28 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-04 08:18:44 -0500 |
commit | 66a5ca4b2c62c44692316f27b0fa39a037cce295 (patch) | |
tree | d872e46bf6acedfae26a26b06745a265aebe2ba6 /drivers/base | |
parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) |
PM / Domains: cleanup: rename gpd -> genpd in debugfs interface
To keep consisitency with the rest of the file, use 'genpd' as the
name of the 'struct generic_pm_domain' pointer instead of 'gpd'.
This is just a rename, no functional changes.
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/domain.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index ba4abbe4693c..45937f88e77c 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
@@ -2242,7 +2242,7 @@ static void rtpm_status_str(struct seq_file *s, struct device *dev) | |||
2242 | } | 2242 | } |
2243 | 2243 | ||
2244 | static int pm_genpd_summary_one(struct seq_file *s, | 2244 | static int pm_genpd_summary_one(struct seq_file *s, |
2245 | struct generic_pm_domain *gpd) | 2245 | struct generic_pm_domain *genpd) |
2246 | { | 2246 | { |
2247 | static const char * const status_lookup[] = { | 2247 | static const char * const status_lookup[] = { |
2248 | [GPD_STATE_ACTIVE] = "on", | 2248 | [GPD_STATE_ACTIVE] = "on", |
@@ -2256,26 +2256,26 @@ static int pm_genpd_summary_one(struct seq_file *s, | |||
2256 | struct gpd_link *link; | 2256 | struct gpd_link *link; |
2257 | int ret; | 2257 | int ret; |
2258 | 2258 | ||
2259 | ret = mutex_lock_interruptible(&gpd->lock); | 2259 | ret = mutex_lock_interruptible(&genpd->lock); |
2260 | if (ret) | 2260 | if (ret) |
2261 | return -ERESTARTSYS; | 2261 | return -ERESTARTSYS; |
2262 | 2262 | ||
2263 | if (WARN_ON(gpd->status >= ARRAY_SIZE(status_lookup))) | 2263 | if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup))) |
2264 | goto exit; | 2264 | goto exit; |
2265 | seq_printf(s, "%-30s %-15s ", gpd->name, status_lookup[gpd->status]); | 2265 | seq_printf(s, "%-30s %-15s ", genpd->name, status_lookup[genpd->status]); |
2266 | 2266 | ||
2267 | /* | 2267 | /* |
2268 | * Modifications on the list require holding locks on both | 2268 | * Modifications on the list require holding locks on both |
2269 | * master and slave, so we are safe. | 2269 | * master and slave, so we are safe. |
2270 | * Also gpd->name is immutable. | 2270 | * Also genpd->name is immutable. |
2271 | */ | 2271 | */ |
2272 | list_for_each_entry(link, &gpd->master_links, master_node) { | 2272 | list_for_each_entry(link, &genpd->master_links, master_node) { |
2273 | seq_printf(s, "%s", link->slave->name); | 2273 | seq_printf(s, "%s", link->slave->name); |
2274 | if (!list_is_last(&link->master_node, &gpd->master_links)) | 2274 | if (!list_is_last(&link->master_node, &genpd->master_links)) |
2275 | seq_puts(s, ", "); | 2275 | seq_puts(s, ", "); |
2276 | } | 2276 | } |
2277 | 2277 | ||
2278 | list_for_each_entry(pm_data, &gpd->dev_list, list_node) { | 2278 | list_for_each_entry(pm_data, &genpd->dev_list, list_node) { |
2279 | kobj_path = kobject_get_path(&pm_data->dev->kobj, GFP_KERNEL); | 2279 | kobj_path = kobject_get_path(&pm_data->dev->kobj, GFP_KERNEL); |
2280 | if (kobj_path == NULL) | 2280 | if (kobj_path == NULL) |
2281 | continue; | 2281 | continue; |
@@ -2287,14 +2287,14 @@ static int pm_genpd_summary_one(struct seq_file *s, | |||
2287 | 2287 | ||
2288 | seq_puts(s, "\n"); | 2288 | seq_puts(s, "\n"); |
2289 | exit: | 2289 | exit: |
2290 | mutex_unlock(&gpd->lock); | 2290 | mutex_unlock(&genpd->lock); |
2291 | 2291 | ||
2292 | return 0; | 2292 | return 0; |
2293 | } | 2293 | } |
2294 | 2294 | ||
2295 | static int pm_genpd_summary_show(struct seq_file *s, void *data) | 2295 | static int pm_genpd_summary_show(struct seq_file *s, void *data) |
2296 | { | 2296 | { |
2297 | struct generic_pm_domain *gpd; | 2297 | struct generic_pm_domain *genpd; |
2298 | int ret = 0; | 2298 | int ret = 0; |
2299 | 2299 | ||
2300 | seq_puts(s, " domain status slaves\n"); | 2300 | seq_puts(s, " domain status slaves\n"); |
@@ -2305,8 +2305,8 @@ static int pm_genpd_summary_show(struct seq_file *s, void *data) | |||
2305 | if (ret) | 2305 | if (ret) |
2306 | return -ERESTARTSYS; | 2306 | return -ERESTARTSYS; |
2307 | 2307 | ||
2308 | list_for_each_entry(gpd, &gpd_list, gpd_list_node) { | 2308 | list_for_each_entry(genpd, &gpd_list, gpd_list_node) { |
2309 | ret = pm_genpd_summary_one(s, gpd); | 2309 | ret = pm_genpd_summary_one(s, genpd); |
2310 | if (ret) | 2310 | if (ret) |
2311 | break; | 2311 | break; |
2312 | } | 2312 | } |