Skip to content

Commit

Permalink
PM / Domains: Add power-on function using names to identify domains
Browse files Browse the repository at this point in the history
It sometimes is necessary to turn on a given PM domain when only
the name of it is known and the domain pointer is not readily
available.  For this reason, add a new helper function,
pm_genpd_name_poweron(), allowing the caller to turn on a PM domain
using its name for identification.  To avoid code duplication,
move the domain lookup code to a separate function.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
  • Loading branch information
Rafael J. Wysocki committed Sep 3, 2012
1 parent fb7268b commit 8bc0251
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 15 deletions.
46 changes: 31 additions & 15 deletions drivers/base/power/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,24 @@
static LIST_HEAD(gpd_list);
static DEFINE_MUTEX(gpd_list_lock);

static struct generic_pm_domain *pm_genpd_lookup_name(const char *domain_name)
{
struct generic_pm_domain *genpd = NULL, *gpd;

if (IS_ERR_OR_NULL(domain_name))
return NULL;

mutex_lock(&gpd_list_lock);
list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
if (!strcmp(gpd->name, domain_name)) {
genpd = gpd;
break;
}
}
mutex_unlock(&gpd_list_lock);
return genpd;
}

#ifdef CONFIG_PM

struct generic_pm_domain *dev_to_genpd(struct device *dev)
Expand Down Expand Up @@ -262,6 +280,18 @@ int pm_genpd_poweron(struct generic_pm_domain *genpd)
return ret;
}

/**
* pm_genpd_name_poweron - Restore power to a given PM domain and its masters.
* @domain_name: Name of the PM domain to power up.
*/
int pm_genpd_name_poweron(const char *domain_name)
{
struct generic_pm_domain *genpd;

genpd = pm_genpd_lookup_name(domain_name);
return genpd ? pm_genpd_poweron(genpd) : -EINVAL;
}

#endif /* CONFIG_PM */

#ifdef CONFIG_PM_RUNTIME
Expand Down Expand Up @@ -1475,21 +1505,7 @@ int __pm_genpd_of_add_device(struct device_node *genpd_node, struct device *dev,
int __pm_genpd_name_add_device(const char *domain_name, struct device *dev,
struct gpd_timing_data *td)
{
struct generic_pm_domain *genpd = NULL, *gpd;

if (IS_ERR_OR_NULL(domain_name) || IS_ERR_OR_NULL(dev))
return -EINVAL;

mutex_lock(&gpd_list_lock);
list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
if (!strcmp(gpd->name, domain_name)) {
genpd = gpd;
break;
}
}
mutex_unlock(&gpd_list_lock);

return __pm_genpd_add_device(genpd, dev, td);
return __pm_genpd_add_device(pm_genpd_lookup_name(domain_name), dev, td);
}

/**
Expand Down
5 changes: 5 additions & 0 deletions include/linux/pm_domain.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ extern void pm_genpd_init(struct generic_pm_domain *genpd,
struct dev_power_governor *gov, bool is_off);

extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
extern int pm_genpd_name_poweron(const char *domain_name);

extern bool default_stop_ok(struct device *dev);

Expand Down Expand Up @@ -240,6 +241,10 @@ static inline int pm_genpd_poweron(struct generic_pm_domain *genpd)
{
return -ENOSYS;
}
static inline int pm_genpd_name_poweron(const char *domain_name)
{
return -ENOSYS;
}
static inline bool default_stop_ok(struct device *dev)
{
return false;
Expand Down

0 comments on commit 8bc0251

Please sign in to comment.