]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
PM / domains: Remove redundant check for CONFIG_PM
authorUlf Hansson <ulf.hansson@linaro.org>
Wed, 3 Sep 2014 10:52:23 +0000 (12:52 +0200)
committerRobin Gong <b38343@freescale.com>
Wed, 11 Feb 2015 05:07:30 +0000 (13:07 +0800)
CONFIG_PM_GENERIC_DOMAINS depends on CONFIG_PM, thus there are no need
to check explicity for it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 784b0d3d8bc5b8ac60fc620c3420dc430bba61a7)
(cherry picked from commit d5b35c3260e14bff3f201c6f6ea59b1c91f1cff1)

drivers/base/power/domain.c

index a3d9275160aa819439e17bdc3a0c32d8934cdca2..578eb58a8eb95639ed8c490190607b39f37a4899 100644 (file)
@@ -66,8 +66,6 @@ static struct generic_pm_domain *pm_genpd_lookup_name(const char *domain_name)
        return genpd;
 }
 
-#ifdef CONFIG_PM
-
 struct generic_pm_domain *dev_to_genpd(struct device *dev)
 {
        if (IS_ERR_OR_NULL(dev->pm_domain))
@@ -281,8 +279,6 @@ int pm_genpd_name_poweron(const char *domain_name)
        return genpd ? pm_genpd_poweron(genpd) : -EINVAL;
 }
 
-#endif /* CONFIG_PM */
-
 #ifdef CONFIG_PM_RUNTIME
 
 static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd,