lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PM / Domains: Make device removal more straightforward

Browse Source 
The removal of a device from a PM domain doesn't have to browse
the domain's device list, because it can check directly if the
device belongs to the given domain.  Moreover, it should clear
the domain_data pointer in dev->power.subsys_data, because
dev_pm_put_subsys_data(dev) may not remove dev->power.subsys_data
and the stale domain data pointer may cause problems to happen.

Rework pm_genpd_remove_device() taking the above observations into
account.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki
2012-05-01 21:33:53 +02:00
parent 23e0fc5ae6
commit efa6902501
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/base/power/domain.c
View File

@@ -1279,11 +1279,13 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
struct device *dev) struct device *dev)
{ {
struct pm_domain_data *pdd; struct pm_domain_data *pdd;
int ret = -EINVAL; int ret = 0;
dev_dbg(dev, "%s()\n", __func__); dev_dbg(dev, "%s()\n", __func__);
if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)
|| IS_ERR_OR_NULL(dev->pm_domain)
|| pd_to_genpd(dev->pm_domain) != genpd)
return -EINVAL; return -EINVAL;
genpd_acquire_lock(genpd); genpd_acquire_lock(genpd);
@@ -1293,21 +1295,14 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
goto out; goto out;
} }
list_for_each_entry(pdd, &genpd->dev_list, list_node) { dev->pm_domain = NULL;
if (pdd->dev != dev) pdd = dev->power.subsys_data->domain_data;
continue; list_del_init(&pdd->list_node);
dev->power.subsys_data->domain_data = NULL;
dev_pm_put_subsys_data(dev);
kfree(to_gpd_data(pdd));
list_del_init(&pdd->list_node); genpd->device_count--;
pdd->dev = NULL;
dev_pm_put_subsys_data(dev);
dev->pm_domain = NULL;
kfree(to_gpd_data(pdd));
genpd->device_count--;
ret = 0;
break;
}
out: out:
genpd_release_lock(genpd); genpd_release_lock(genpd);