luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: cpuidle: Remove duplicate header inclusion

Browse Source 
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>
This commit is contained in:
Daniel Lezcano 2015-02-02 16:32:46 +01:00
parent bc465aa9d0
commit eeebc3bb4d
15 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/cpuidle.h
View File

@ -1,6 +1,8 @@
#ifndef __ASM_ARM_CPUIDLE_H #ifndef __ASM_ARM_CPUIDLE_H
#define __ASM_ARM_CPUIDLE_H #define __ASM_ARM_CPUIDLE_H
#include <asm/proc-fns.h>
#ifdef CONFIG_CPU_IDLE #ifdef CONFIG_CPU_IDLE
extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev, extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index); struct cpuidle_driver *drv, int index);

2
arch/arm/kernel/cpuidle.c
View File

@ -10,7 +10,7 @@
*/ */
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <asm/proc-fns.h> #include <asm/cpuidle.h>
int arm_cpuidle_simple_enter(struct cpuidle_device *dev, int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index) struct cpuidle_driver *drv, int index)

1
arch/arm/mach-davinci/cpuidle.c
View File

@ -17,7 +17,6 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/export.h> #include <linux/export.h>
#include <asm/proc-fns.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <mach/cpuidle.h> #include <mach/cpuidle.h>

1
arch/arm/mach-imx/cpuidle-imx6q.c
View File

@ -9,7 +9,6 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
#include "common.h" #include "common.h"
#include "cpuidle.h" #include "cpuidle.h"

1
arch/arm/mach-imx/cpuidle-imx6sl.c
View File

@ -9,7 +9,6 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
#include "common.h" #include "common.h"
#include "cpuidle.h" #include "cpuidle.h"

1
arch/arm/mach-imx/cpuidle-imx6sx.c
View File

@ -10,7 +10,6 @@
#include <linux/cpu_pm.h> #include <linux/cpu_pm.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
#include <asm/suspend.h> #include <asm/suspend.h>
#include "common.h" #include "common.h"

1
arch/arm/mach-omap2/cpuidle44xx.c
View File

@ -17,7 +17,6 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
#include "common.h" #include "common.h"
#include "pm.h" #include "pm.h"

2
arch/arm/mach-s3c64xx/cpuidle.c
View File

@ -16,7 +16,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/proc-fns.h> #include <asm/cpuidle.h>
#include <mach/map.h> #include <mach/map.h>

1
arch/arm/mach-tegra/cpuidle-tegra20.c
View File

@ -27,7 +27,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include <asm/suspend.h> #include <asm/suspend.h>

1
arch/arm/mach-tegra/cpuidle-tegra30.c
View File

@ -27,7 +27,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include <asm/suspend.h> #include <asm/suspend.h>

1
drivers/cpuidle/cpuidle-at91.c
View File

@ -19,7 +19,6 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/export.h> #include <linux/export.h>
#include <asm/proc-fns.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#define AT91_MAX_STATES 2 #define AT91_MAX_STATES 2

1
drivers/cpuidle/cpuidle-exynos.c
View File

@ -19,7 +19,6 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_data/cpuidle-exynos.h> #include <linux/platform_data/cpuidle-exynos.h>
#include <asm/proc-fns.h>
#include <asm/suspend.h> #include <asm/suspend.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>

1
drivers/cpuidle/cpuidle-kirkwood.c
View File

@ -21,7 +21,6 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/export.h> #include <linux/export.h>
#include <asm/proc-fns.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#define KIRKWOOD_MAX_STATES 2 #define KIRKWOOD_MAX_STATES 2

1
drivers/cpuidle/cpuidle-ux500.c
View File

@ -19,7 +19,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/proc-fns.h>
static atomic_t master = ATOMIC_INIT(0); static atomic_t master = ATOMIC_INIT(0);
static DEFINE_SPINLOCK(master_lock); static DEFINE_SPINLOCK(master_lock);

1
drivers/cpuidle/cpuidle-zynq.c
View File

@ -28,7 +28,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/proc-fns.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#define ZYNQ_MAX_STATES 2 #define ZYNQ_MAX_STATES 2