diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/domain.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index c5280f2b798b..f9e7df554b2f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
@@ -1384,7 +1384,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron); | |||
1384 | 1384 | ||
1385 | #endif /* CONFIG_PM_SLEEP */ | 1385 | #endif /* CONFIG_PM_SLEEP */ |
1386 | 1386 | ||
1387 | static struct generic_pm_domain_data *__pm_genpd_alloc_dev_data(struct device *dev) | 1387 | static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev) |
1388 | { | 1388 | { |
1389 | struct generic_pm_domain_data *gpd_data; | 1389 | struct generic_pm_domain_data *gpd_data; |
1390 | 1390 | ||
@@ -1398,8 +1398,8 @@ static struct generic_pm_domain_data *__pm_genpd_alloc_dev_data(struct device *d | |||
1398 | return gpd_data; | 1398 | return gpd_data; |
1399 | } | 1399 | } |
1400 | 1400 | ||
1401 | static void __pm_genpd_free_dev_data(struct device *dev, | 1401 | static void genpd_free_dev_data(struct device *dev, |
1402 | struct generic_pm_domain_data *gpd_data) | 1402 | struct generic_pm_domain_data *gpd_data) |
1403 | { | 1403 | { |
1404 | dev_pm_qos_remove_notifier(dev, &gpd_data->nb); | 1404 | dev_pm_qos_remove_notifier(dev, &gpd_data->nb); |
1405 | kfree(gpd_data); | 1405 | kfree(gpd_data); |
@@ -1423,7 +1423,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, | |||
1423 | if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) | 1423 | if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) |
1424 | return -EINVAL; | 1424 | return -EINVAL; |
1425 | 1425 | ||
1426 | gpd_data_new = __pm_genpd_alloc_dev_data(dev); | 1426 | gpd_data_new = genpd_alloc_dev_data(dev); |
1427 | if (!gpd_data_new) | 1427 | if (!gpd_data_new) |
1428 | return -ENOMEM; | 1428 | return -ENOMEM; |
1429 | 1429 | ||
@@ -1477,7 +1477,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, | |||
1477 | genpd_release_lock(genpd); | 1477 | genpd_release_lock(genpd); |
1478 | 1478 | ||
1479 | if (gpd_data != gpd_data_new) | 1479 | if (gpd_data != gpd_data_new) |
1480 | __pm_genpd_free_dev_data(dev, gpd_data_new); | 1480 | genpd_free_dev_data(dev, gpd_data_new); |
1481 | 1481 | ||
1482 | return ret; | 1482 | return ret; |
1483 | } | 1483 | } |
@@ -1548,7 +1548,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, | |||
1548 | 1548 | ||
1549 | dev_pm_put_subsys_data(dev); | 1549 | dev_pm_put_subsys_data(dev); |
1550 | if (remove) | 1550 | if (remove) |
1551 | __pm_genpd_free_dev_data(dev, gpd_data); | 1551 | genpd_free_dev_data(dev, gpd_data); |
1552 | 1552 | ||
1553 | return 0; | 1553 | return 0; |
1554 | 1554 | ||