aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-09-03 06:52:23 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-08 18:46:12 -0400
commit784b0d3d8bc5b8ac60fc620c3420dc430bba61a7 (patch)
tree389aac1ac00ff87d213633769089dbcc1f2a2c05
parentc5d79ec2a5715489cff16a0d1cf4fa9108a5509e (diff)
PM / domains: Remove redundant check for CONFIG_PM
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>
-rw-r--r--drivers/base/power/domain.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 4298a2bcd228..b910d0f6ff60 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -66,8 +66,6 @@ static struct generic_pm_domain *pm_genpd_lookup_name(const char *domain_name)
66 return genpd; 66 return genpd;
67} 67}
68 68
69#ifdef CONFIG_PM
70
71struct generic_pm_domain *dev_to_genpd(struct device *dev) 69struct generic_pm_domain *dev_to_genpd(struct device *dev)
72{ 70{
73 if (IS_ERR_OR_NULL(dev->pm_domain)) 71 if (IS_ERR_OR_NULL(dev->pm_domain))
@@ -281,8 +279,6 @@ int pm_genpd_name_poweron(const char *domain_name)
281 return genpd ? pm_genpd_poweron(genpd) : -EINVAL; 279 return genpd ? pm_genpd_poweron(genpd) : -EINVAL;
282} 280}
283 281
284#endif /* CONFIG_PM */
285
286#ifdef CONFIG_PM_RUNTIME 282#ifdef CONFIG_PM_RUNTIME
287 283
288static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd, 284static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd,