Skip to content

Commit eeebc3b

Browse files
dlezcanodlezcano
committed
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>
1 parent bc465aa commit eeebc3b

File tree

15 files changed

+4
-14
lines changed

15 files changed

+4
-14
lines changed

‎arch/arm/include/asm/cpuidle.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef __ASM_ARM_CPUIDLE_H
22
#define __ASM_ARM_CPUIDLE_H
33

4+
#include <asm/proc-fns.h>
5+
46
#ifdef CONFIG_CPU_IDLE
57
extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
68
struct cpuidle_driver *drv, int index);

‎arch/arm/kernel/cpuidle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
#include <linux/cpuidle.h>
13-
#include <asm/proc-fns.h>
13+
#include <asm/cpuidle.h>
1414

1515
int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
1616
struct cpuidle_driver *drv, int index)

‎arch/arm/mach-davinci/cpuidle.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <linux/cpuidle.h>
1818
#include <linux/io.h>
1919
#include <linux/export.h>
20-
#include <asm/proc-fns.h>
2120
#include <asm/cpuidle.h>
2221

2322
#include <mach/cpuidle.h>

‎arch/arm/mach-imx/cpuidle-imx6q.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/cpuidle.h>
1010
#include <linux/module.h>
1111
#include <asm/cpuidle.h>
12-
#include <asm/proc-fns.h>
1312

1413
#include "common.h"
1514
#include "cpuidle.h"

‎arch/arm/mach-imx/cpuidle-imx6sl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/cpuidle.h>
1010
#include <linux/module.h>
1111
#include <asm/cpuidle.h>
12-
#include <asm/proc-fns.h>
1312

1413
#include "common.h"
1514
#include "cpuidle.h"

‎arch/arm/mach-imx/cpuidle-imx6sx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/cpu_pm.h>
1111
#include <linux/module.h>
1212
#include <asm/cpuidle.h>
13-
#include <asm/proc-fns.h>
1413
#include <asm/suspend.h>
1514

1615
#include "common.h"

‎arch/arm/mach-omap2/cpuidle44xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <linux/clockchips.h>
1818

1919
#include <asm/cpuidle.h>
20-
#include <asm/proc-fns.h>
2120

2221
#include "common.h"
2322
#include "pm.h"

‎arch/arm/mach-s3c64xx/cpuidle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/export.h>
1717
#include <linux/time.h>
1818

19-
#include <asm/proc-fns.h>
19+
#include <asm/cpuidle.h>
2020

2121
#include <mach/map.h>
2222

‎arch/arm/mach-tegra/cpuidle-tegra20.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <linux/module.h>
2828

2929
#include <asm/cpuidle.h>
30-
#include <asm/proc-fns.h>
3130
#include <asm/smp_plat.h>
3231
#include <asm/suspend.h>
3332

‎arch/arm/mach-tegra/cpuidle-tegra30.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <linux/module.h>
2828

2929
#include <asm/cpuidle.h>
30-
#include <asm/proc-fns.h>
3130
#include <asm/smp_plat.h>
3231
#include <asm/suspend.h>
3332

‎drivers/cpuidle/cpuidle-at91.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/cpuidle.h>
2020
#include <linux/io.h>
2121
#include <linux/export.h>
22-
#include <asm/proc-fns.h>
2322
#include <asm/cpuidle.h>
2423

2524
#define AT91_MAX_STATES 2

‎drivers/cpuidle/cpuidle-exynos.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/of.h>
2020
#include <linux/platform_data/cpuidle-exynos.h>
2121

22-
#include <asm/proc-fns.h>
2322
#include <asm/suspend.h>
2423
#include <asm/cpuidle.h>
2524

‎drivers/cpuidle/cpuidle-kirkwood.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <linux/cpuidle.h>
2222
#include <linux/io.h>
2323
#include <linux/export.h>
24-
#include <asm/proc-fns.h>
2524
#include <asm/cpuidle.h>
2625

2726
#define KIRKWOOD_MAX_STATES 2

‎drivers/cpuidle/cpuidle-ux500.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/platform_device.h>
2020

2121
#include <asm/cpuidle.h>
22-
#include <asm/proc-fns.h>
2322

2423
static atomic_t master = ATOMIC_INIT(0);
2524
static DEFINE_SPINLOCK(master_lock);

‎drivers/cpuidle/cpuidle-zynq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <linux/init.h>
2929
#include <linux/cpuidle.h>
3030
#include <linux/platform_device.h>
31-
#include <asm/proc-fns.h>
3231
#include <asm/cpuidle.h>
3332

3433
#define ZYNQ_MAX_STATES 2

0 commit comments

Comments
 (0)