diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2015-01-27 15:13:41 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 16:56:53 -0500 |
| commit | e07b45cb98839aa972c099ffd5fc5eb2ff1b2e26 (patch) | |
| tree | 70e3b561bc011d329f52f0a44d08d991a4dcbc95 /drivers/base/power | |
| parent | 14b530648834c9ec9853954750957bab0f792538 (diff) | |
PM / Domains: Don't check for an existing device when adding a new
When adding a device to a genpd, we no longer need to walk genpd's list
of existing devices to verify it hasn't already been added.
Instead we can now rely on the verification of not allowing existing
generic_pm_domain_data for a device, since that has the same meaning.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base/power')
| -rw-r--r-- | drivers/base/power/domain.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 76eb0c3ef2b3..88198ba919d9 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
| @@ -1415,7 +1415,6 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, | |||
| 1415 | struct gpd_timing_data *td) | 1415 | struct gpd_timing_data *td) |
| 1416 | { | 1416 | { |
| 1417 | struct generic_pm_domain_data *gpd_data_new, *gpd_data = NULL; | 1417 | struct generic_pm_domain_data *gpd_data_new, *gpd_data = NULL; |
| 1418 | struct pm_domain_data *pdd; | ||
| 1419 | int ret = 0; | 1418 | int ret = 0; |
| 1420 | 1419 | ||
| 1421 | dev_dbg(dev, "%s()\n", __func__); | 1420 | dev_dbg(dev, "%s()\n", __func__); |
| @@ -1434,12 +1433,6 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, | |||
| 1434 | goto out; | 1433 | goto out; |
| 1435 | } | 1434 | } |
| 1436 | 1435 | ||
| 1437 | list_for_each_entry(pdd, &genpd->dev_list, list_node) | ||
| 1438 | if (pdd->dev == dev) { | ||
| 1439 | ret = -EINVAL; | ||
| 1440 | goto out; | ||
| 1441 | } | ||
| 1442 | |||
| 1443 | ret = dev_pm_get_subsys_data(dev); | 1436 | ret = dev_pm_get_subsys_data(dev); |
| 1444 | if (ret) | 1437 | if (ret) |
| 1445 | goto out; | 1438 | goto out; |
