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

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>

+4 -14
+2
arch/arm/include/asm/cpuidle.h
··· 1 1 #ifndef __ASM_ARM_CPUIDLE_H 2 2 #define __ASM_ARM_CPUIDLE_H 3 3 4 + #include <asm/proc-fns.h> 5 + 4 6 #ifdef CONFIG_CPU_IDLE 5 7 extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev, 6 8 struct cpuidle_driver *drv, int index);
+1 -1
arch/arm/kernel/cpuidle.c
··· 10 10 */ 11 11 12 12 #include <linux/cpuidle.h> 13 - #include <asm/proc-fns.h> 13 + #include <asm/cpuidle.h> 14 14 15 15 int arm_cpuidle_simple_enter(struct cpuidle_device *dev, 16 16 struct cpuidle_driver *drv, int index)
-1
arch/arm/mach-davinci/cpuidle.c
··· 17 17 #include <linux/cpuidle.h> 18 18 #include <linux/io.h> 19 19 #include <linux/export.h> 20 - #include <asm/proc-fns.h> 21 20 #include <asm/cpuidle.h> 22 21 23 22 #include <mach/cpuidle.h>
-1
arch/arm/mach-imx/cpuidle-imx6q.c
··· 9 9 #include <linux/cpuidle.h> 10 10 #include <linux/module.h> 11 11 #include <asm/cpuidle.h> 12 - #include <asm/proc-fns.h> 13 12 14 13 #include "common.h" 15 14 #include "cpuidle.h"
-1
arch/arm/mach-imx/cpuidle-imx6sl.c
··· 9 9 #include <linux/cpuidle.h> 10 10 #include <linux/module.h> 11 11 #include <asm/cpuidle.h> 12 - #include <asm/proc-fns.h> 13 12 14 13 #include "common.h" 15 14 #include "cpuidle.h"
-1
arch/arm/mach-imx/cpuidle-imx6sx.c
··· 10 10 #include <linux/cpu_pm.h> 11 11 #include <linux/module.h> 12 12 #include <asm/cpuidle.h> 13 - #include <asm/proc-fns.h> 14 13 #include <asm/suspend.h> 15 14 16 15 #include "common.h"
-1
arch/arm/mach-omap2/cpuidle44xx.c
··· 17 17 #include <linux/clockchips.h> 18 18 19 19 #include <asm/cpuidle.h> 20 - #include <asm/proc-fns.h> 21 20 22 21 #include "common.h" 23 22 #include "pm.h"
+1 -1
arch/arm/mach-s3c64xx/cpuidle.c
··· 16 16 #include <linux/export.h> 17 17 #include <linux/time.h> 18 18 19 - #include <asm/proc-fns.h> 19 + #include <asm/cpuidle.h> 20 20 21 21 #include <mach/map.h> 22 22
-1
arch/arm/mach-tegra/cpuidle-tegra20.c
··· 27 27 #include <linux/module.h> 28 28 29 29 #include <asm/cpuidle.h> 30 - #include <asm/proc-fns.h> 31 30 #include <asm/smp_plat.h> 32 31 #include <asm/suspend.h> 33 32
-1
arch/arm/mach-tegra/cpuidle-tegra30.c
··· 27 27 #include <linux/module.h> 28 28 29 29 #include <asm/cpuidle.h> 30 - #include <asm/proc-fns.h> 31 30 #include <asm/smp_plat.h> 32 31 #include <asm/suspend.h> 33 32
-1
drivers/cpuidle/cpuidle-at91.c
··· 19 19 #include <linux/cpuidle.h> 20 20 #include <linux/io.h> 21 21 #include <linux/export.h> 22 - #include <asm/proc-fns.h> 23 22 #include <asm/cpuidle.h> 24 23 25 24 #define AT91_MAX_STATES 2
-1
drivers/cpuidle/cpuidle-exynos.c
··· 19 19 #include <linux/of.h> 20 20 #include <linux/platform_data/cpuidle-exynos.h> 21 21 22 - #include <asm/proc-fns.h> 23 22 #include <asm/suspend.h> 24 23 #include <asm/cpuidle.h> 25 24
-1
drivers/cpuidle/cpuidle-kirkwood.c
··· 21 21 #include <linux/cpuidle.h> 22 22 #include <linux/io.h> 23 23 #include <linux/export.h> 24 - #include <asm/proc-fns.h> 25 24 #include <asm/cpuidle.h> 26 25 27 26 #define KIRKWOOD_MAX_STATES 2
-1
drivers/cpuidle/cpuidle-ux500.c
··· 19 19 #include <linux/platform_device.h> 20 20 21 21 #include <asm/cpuidle.h> 22 - #include <asm/proc-fns.h> 23 22 24 23 static atomic_t master = ATOMIC_INIT(0); 25 24 static DEFINE_SPINLOCK(master_lock);
-1
drivers/cpuidle/cpuidle-zynq.c
··· 28 28 #include <linux/init.h> 29 29 #include <linux/cpuidle.h> 30 30 #include <linux/platform_device.h> 31 - #include <asm/proc-fns.h> 32 31 #include <asm/cpuidle.h> 33 32 34 33 #define ZYNQ_MAX_STATES 2