diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-26 15:40:18 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-26 15:40:18 +0400 |
| commit | 484cdd87e2e7f480d8386c890edebe2d0630c46a (patch) | |
| tree | 4745ba6f295603ab2419ff316a2d2f2218d24426 | |
| parent | 9391b5fafd055f0b1c26a960999a1767b71844be (diff) | |
Fix tilt-3.4 branch merge errortracking-tilt-3.4-fixes-llt-20120626.1tracking-tilt-3.4-fixes-llt-20120626.0
tilt-3.4 branch merged the "cpuidle: add support for states that affect
multiple cpus" commit by Colin Cross twice. The result is duplicate code
in drivers/cpuidle/cpuidle.c and drivers/cpuidle/cpuidle.h, and build
failure if CPU_IDLE is enabled.
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 5 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle.h | 30 |
2 files changed, 0 insertions, 35 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index b0ad298079b2..3330a37fa3bb 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -433,11 +433,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) 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 */ |