Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49d400c7 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Rename __pm_genpd_alloc|free_dev_data() 



In a step to get consistent names of functions in genpd, rename
the internal __pm_genpd_alloc|free_dev_data() into
gendp_alloc|free_dev_data().

As discussed on the linux-pm list, let's move towards the following
name rules:

Internal functions:
genpd_*
_genpd_*
__genpd_*

External functions:
pm_genpd_*
_pm_genpd_*
__pm_genpd_*

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 382548a6

drivers/base/power/domain.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1384,7 +1384,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron); 




#endif /* CONFIG_PM_SLEEP */

#endif /* CONFIG_PM_SLEEP */





static struct generic_pm_domain_data *__pm_genpd_alloc_dev_data(struct device *dev)

static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev)

{

{

	struct generic_pm_domain_data *gpd_data;

	struct generic_pm_domain_data *gpd_data;
@@ -1398,7 +1398,7 @@ static struct generic_pm_domain_data *__pm_genpd_alloc_dev_data(struct device *d 
	return gpd_data;

	return gpd_data;

}

}





static void __pm_genpd_free_dev_data(struct device *dev,

static void genpd_free_dev_data(struct device *dev,

				struct generic_pm_domain_data *gpd_data)

				struct generic_pm_domain_data *gpd_data)

{

{

	dev_pm_qos_remove_notifier(dev, &gpd_data->nb);

	dev_pm_qos_remove_notifier(dev, &gpd_data->nb);
@@ -1423,7 +1423,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 
	if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))

	if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))

		return -EINVAL;

		return -EINVAL;





	gpd_data_new = __pm_genpd_alloc_dev_data(dev);

	gpd_data_new = genpd_alloc_dev_data(dev);

	if (!gpd_data_new)

	if (!gpd_data_new)

		return -ENOMEM;

		return -ENOMEM;
@@ -1477,7 +1477,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 
	genpd_release_lock(genpd);

	genpd_release_lock(genpd);





	if (gpd_data != gpd_data_new)

	if (gpd_data != gpd_data_new)

		__pm_genpd_free_dev_data(dev, gpd_data_new);

		genpd_free_dev_data(dev, gpd_data_new);





	return ret;

	return ret;

}

}
@@ -1548,7 +1548,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, 




	dev_pm_put_subsys_data(dev);

	dev_pm_put_subsys_data(dev);

	if (remove)

	if (remove)

		__pm_genpd_free_dev_data(dev, gpd_data);

		genpd_free_dev_data(dev, gpd_data);





	return 0;

	return 0;