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

Commit 53af16f7 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Silence compiler warning for an unused function 



The only remaining caller of genpd_poweron() is conditionally compiled
based on CONFIG_PM_GENERIC_DOMAINS_OF, so we get a warning when that is
unset.

By moving the locking/unlocking of the genpd outside genpd_poweron(), thus
to the caller, genpd_poweron() becomes redundant.

Within this context let's then rename the wrapper function,
__genpd_poweron(), to genpd_poweron() as it will then be consistent with
its friend genpd_poweroff().

This change silence the warning about the unused function.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: ea823c7c "PM / Domains: Remove pm_genpd_poweron() API"
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: 4.4+ <stable@vger.kernel.org> # 4.4+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 36f90b0a

drivers/base/power/domain.c

+7 −20
Original line number Diff line number Diff line
@@ -173,14 +173,14 @@ static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) 
}



/**

 * __genpd_poweron - Restore power to a given PM domain and its masters.

 * genpd_poweron - Restore power to a given PM domain and its masters.

 * @genpd: PM domain to power up.

 * @depth: nesting count for lockdep.

 *

 * Restore power to @genpd and all of its masters so that it is possible to

 * resume a device belonging to it.

 */

static int __genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth)

static int genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth)

{

	struct gpd_link *link;

	int ret = 0;
@@ -200,7 +200,7 @@ static int __genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth) 
		genpd_sd_counter_inc(master);



		mutex_lock_nested(&master->lock, depth + 1);

		ret = __genpd_poweron(master, depth + 1);

		ret = genpd_poweron(master, depth + 1);

		mutex_unlock(&master->lock);



		if (ret) {
@@ -227,21 +227,6 @@ static int __genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth) 
	return ret;

}



/**

 * genpd_poweron - Restore power to a given PM domain and its masters.

 * @genpd: PM domain to power up.

 */

static int genpd_poweron(struct generic_pm_domain *genpd)

{

	int ret;



	mutex_lock(&genpd->lock);

	ret = __genpd_poweron(genpd, 0);

	mutex_unlock(&genpd->lock);

	return ret;

}





static int genpd_save_dev(struct generic_pm_domain *genpd, struct device *dev)

{

	return GENPD_DEV_CALLBACK(genpd, int, save_state, dev);
@@ -489,7 +474,7 @@ static int pm_genpd_runtime_resume(struct device *dev) 
	}



	mutex_lock(&genpd->lock);

	ret = __genpd_poweron(genpd, 0);

	ret = genpd_poweron(genpd, 0);

	mutex_unlock(&genpd->lock);



	if (ret)
@@ -1821,8 +1806,10 @@ int genpd_dev_pm_attach(struct device *dev) 


	dev->pm_domain->detach = genpd_dev_pm_detach;

	dev->pm_domain->sync = genpd_dev_pm_sync;

	ret = genpd_poweron(pd);



	mutex_lock(&pd->lock);

	ret = genpd_poweron(pd, 0);

	mutex_unlock(&pd->lock);

out:

	return ret ? -EPROBE_DEFER : 0;

}