Fix tilt-3.4 branch merge error
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>
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index b0ad298..3330a37 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -433,11 +433,6 @@
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 f42462e..76e7f69 100644
--- a/drivers/cpuidle/cpuidle.h
+++ b/drivers/cpuidle/cpuidle.h
@@ -62,34 +62,4 @@
}
#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 */