diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-03 06:52:30 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-08 18:46:13 -0400 |
commit | 0f574d4c3a7a325cbbef28ee738dedca9851e957 (patch) | |
tree | f5132cb07d0b640205a8b701e5deec4622f446c5 | |
parent | f1bf45c70ffdcf048d046da4ad4611315f1a15bf (diff) |
PM / domains: Remove default_stop_ok() API
There are currently no need to export default_stop_ok() as an API,
instead let's keep it local to the PM domain governor.
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_governor.c | 7 | ||||
-rw-r--r-- | include/linux/pm_domain.h | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c index a089e3bcdfbc..d88a62e104d4 100644 --- a/drivers/base/power/domain_governor.c +++ b/drivers/base/power/domain_governor.c | |||
@@ -42,7 +42,7 @@ static int dev_update_qos_constraint(struct device *dev, void *data) | |||
42 | * default_stop_ok - Default PM domain governor routine for stopping devices. | 42 | * default_stop_ok - Default PM domain governor routine for stopping devices. |
43 | * @dev: Device to check. | 43 | * @dev: Device to check. |
44 | */ | 44 | */ |
45 | bool default_stop_ok(struct device *dev) | 45 | static bool default_stop_ok(struct device *dev) |
46 | { | 46 | { |
47 | struct gpd_timing_data *td = &dev_gpd_data(dev)->td; | 47 | struct gpd_timing_data *td = &dev_gpd_data(dev)->td; |
48 | unsigned long flags; | 48 | unsigned long flags; |
@@ -229,10 +229,7 @@ static bool always_on_power_down_ok(struct dev_pm_domain *domain) | |||
229 | 229 | ||
230 | #else /* !CONFIG_PM_RUNTIME */ | 230 | #else /* !CONFIG_PM_RUNTIME */ |
231 | 231 | ||
232 | bool default_stop_ok(struct device *dev) | 232 | static inline bool default_stop_ok(struct device *dev) { return false; } |
233 | { | ||
234 | return false; | ||
235 | } | ||
236 | 233 | ||
237 | #define default_power_down_ok NULL | 234 | #define default_power_down_ok NULL |
238 | #define always_on_power_down_ok NULL | 235 | #define always_on_power_down_ok NULL |
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index c19c90b839b8..3b59f296e6ec 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h | |||
@@ -151,8 +151,6 @@ extern void pm_genpd_init(struct generic_pm_domain *genpd, | |||
151 | extern int pm_genpd_poweron(struct generic_pm_domain *genpd); | 151 | extern int pm_genpd_poweron(struct generic_pm_domain *genpd); |
152 | extern int pm_genpd_name_poweron(const char *domain_name); | 152 | extern int pm_genpd_name_poweron(const char *domain_name); |
153 | 153 | ||
154 | extern bool default_stop_ok(struct device *dev); | ||
155 | |||
156 | extern struct dev_power_governor pm_domain_always_on_gov; | 154 | extern struct dev_power_governor pm_domain_always_on_gov; |
157 | #else | 155 | #else |
158 | 156 | ||
@@ -231,10 +229,6 @@ static inline int pm_genpd_name_poweron(const char *domain_name) | |||
231 | { | 229 | { |
232 | return -ENOSYS; | 230 | return -ENOSYS; |
233 | } | 231 | } |
234 | static inline bool default_stop_ok(struct device *dev) | ||
235 | { | ||
236 | return false; | ||
237 | } | ||
238 | #define simple_qos_governor NULL | 232 | #define simple_qos_governor NULL |
239 | #define pm_domain_always_on_gov NULL | 233 | #define pm_domain_always_on_gov NULL |
240 | #endif | 234 | #endif |