ARM: cpuidle: Remove duplicate header inclusion

The cpu_do_idle() function is always used by the cpuidle drivers.

That led to have each driver including cpuidle.h and proc-fns.h, they are
always paired. That makes a lot of duplicate headers inclusion. Instead of
including both in each .c file, move the proc-fns.h header inclusion in the
cpuidle.h header file directly, so we can save some line of code.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
index af319ac..348dc81 100644 (file)
--- a/arch/arm/include/asm/cpuidle.h
+++ b/arch/arm/include/asm/cpuidle.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ARM_CPUIDLE_H
 #define __ASM_ARM_CPUIDLE_H
 
+#include <asm/proc-fns.h>
+
 #ifdef CONFIG_CPU_IDLE
 extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
                struct cpuidle_driver *drv, int index);

diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 89545f6..45969f8 100644 (file)
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/cpuidle.h>
-#include <asm/proc-fns.h>
+#include <asm/cpuidle.h>
 
 int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
                struct cpuidle_driver *drv, int index)

diff --cc arch/arm/mach-davinci/cpuidle.c
Simple merge

diff --cc arch/arm/mach-imx/cpuidle-imx6q.c
Simple merge

diff --cc arch/arm/mach-imx/cpuidle-imx6sl.c
Simple merge

diff --cc arch/arm/mach-imx/cpuidle-imx6sx.c
Simple merge

diff --cc arch/arm/mach-omap2/cpuidle44xx.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/cpuidle.c
Simple merge

diff --cc arch/arm/mach-tegra/cpuidle-tegra20.c
Simple merge

diff --cc arch/arm/mach-tegra/cpuidle-tegra30.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-at91.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-exynos.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-kirkwood.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-ux500.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-zynq.c
Simple merge