Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP3: remove cpuidle_wrap_enter

In a previous commit the en_core_tk_irqen flag has been added but we missed
the cpuidle_wrap_enter which was doing the job to measure the time for the
'omap3_enter_idle' function.

Actually, I don't see any reason to use this wrapper in the code. In the better
case, the time computation is not correctly done because of the different
operations done in omap3_enter_idle_bm which were not taken into account
before the en_core_tk_irqen flag was set.

As the time is reflected for the state overridden by the omap3_enter_idle_bm,
using the wrapper is pointless now, so removing it.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Daniel Lezcano and committed by
Rafael J. Wysocki
3dcb9f1b 80d538b2

+9 -21
+9 -21
arch/arm/mach-omap2/cpuidle34xx.c
··· 99 99 }, 100 100 }; 101 101 102 - /* Private functions */ 103 - 104 - static int __omap3_enter_idle(struct cpuidle_device *dev, 105 - struct cpuidle_driver *drv, 106 - int index) 102 + /** 103 + * omap3_enter_idle - Programs OMAP3 to enter the specified state 104 + * @dev: cpuidle device 105 + * @drv: cpuidle driver 106 + * @index: the index of state to be entered 107 + */ 108 + static int omap3_enter_idle(struct cpuidle_device *dev, 109 + struct cpuidle_driver *drv, 110 + int index) 107 111 { 108 112 struct omap3_idle_statedata *cx = &omap3_idle_data[index]; 109 113 ··· 150 146 local_fiq_enable(); 151 147 152 148 return index; 153 - } 154 - 155 - /** 156 - * omap3_enter_idle - Programs OMAP3 to enter the specified state 157 - * @dev: cpuidle device 158 - * @drv: cpuidle driver 159 - * @index: the index of state to be entered 160 - * 161 - * Called from the CPUidle framework to program the device to the 162 - * specified target state selected by the governor. 163 - */ 164 - static inline int omap3_enter_idle(struct cpuidle_device *dev, 165 - struct cpuidle_driver *drv, 166 - int index) 167 - { 168 - return cpuidle_wrap_enter(dev, drv, index, __omap3_enter_idle); 169 149 } 170 150 171 151 /**