Commit 4384a70c authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM: domains: Move the verification of in-params from genpd_add_device() 



Commit f38d1a6d ("PM: domains: Allocate governor data dynamically
based on a genpd governor") started to use the in-parameters in
genpd_add_device(), without first doing a verification of them.

This isn't really a big problem, as most callers do a verification already.

Therefore, let's drop the verification from genpd_add_device() and make
sure all the callers take care of it instead.

Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Fixes: f38d1a6d ("PM: domains: Allocate governor data dynamically based on a genpd governor")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e5d1c872

drivers/base/power/domain.c

+6 −3
Original line number Diff line number Diff line
@@ -1632,9 +1632,6 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 


	dev_dbg(dev, "%s()\n", __func__);



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

		return -EINVAL;



	gpd_data = genpd_alloc_dev_data(dev, gd);

	if (IS_ERR(gpd_data))

		return PTR_ERR(gpd_data);
@@ -1676,6 +1673,9 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) 
{

	int ret;



	if (!genpd || !dev)

		return -EINVAL;



	mutex_lock(&gpd_list_lock);

	ret = genpd_add_device(genpd, dev, dev);

	mutex_unlock(&gpd_list_lock);
@@ -2523,6 +2523,9 @@ int of_genpd_add_device(struct of_phandle_args *genpdspec, struct device *dev) 
	struct generic_pm_domain *genpd;

	int ret;



	if (!dev)

		return -EINVAL;



	mutex_lock(&gpd_list_lock);



	genpd = genpd_get_from_provider(genpdspec);