diff options
| author | Andy Green <andy.green@linaro.org> | 2012-06-26 22:36:56 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-26 22:36:56 +0800 |
| commit | 11e9232c3c5890da1e73fcfd66a7894a81356975 (patch) | |
| tree | d37ccc164086d74b4d575266fe6fda3a32446599 | |
| parent | 86a35818a88922d7d96a7613c3da5e1157a4061f (diff) | |
revert duplicated CPU_IDLE patchtracking-tilt-3.4-llt-20120626.1
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 6 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle.h | 30 |
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index b0ad298079b2..a1dd9198e28f 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -432,12 +432,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) if (ret) goto err_coupled; - - ret = cpuidle_coupled_register_device(dev); - if (ret) - goto err_coupled; - - dev->registered = 1; return 0; diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h index f42462ec5771..76e7f696ad8c 100644 --- a/drivers/cpuidle/cpuidle.h +++ b/drivers/cpuidle/cpuidle.h @@ -62,34 +62,4 @@ static inline void cpuidle_coupled_unregister_device(struct cpuidle_device *dev) } #endif -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED -bool cpuidle_state_is_coupled(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int state); -int cpuidle_enter_state_coupled(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int next_state); -int cpuidle_coupled_register_device(struct cpuidle_device *dev); -void cpuidle_coupled_unregister_device(struct cpuidle_device *dev); -#else -static inline bool cpuidle_state_is_coupled(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int state) -{ - return false; -} - -static inline int cpuidle_enter_state_coupled(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int next_state) -{ - return -1; -} - -static inline int cpuidle_coupled_register_device(struct cpuidle_device *dev) -{ - return 0; -} - -static inline void cpuidle_coupled_unregister_device(struct cpuidle_device *dev) -{ -} -#endif - #endif /* __DRIVER_CPUIDLE_H */ |