Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeebc3bb authored Feb 02, 2015 by Daniel Lezcano

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>

parent bc465aa9

arch/arm/include/asm/cpuidle.h

+2 −0

Original line number	Diff line number	Diff line
		#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);

arch/arm/kernel/cpuidle.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

arch/arm/mach-davinci/cpuidle.c

+0 −1

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

		#include <mach/cpuidle.h>

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@
		#include <linux/cpuidle.h>
		#include <linux/module.h>
		#include <asm/cpuidle.h>
		#include <asm/proc-fns.h>

		#include "common.h"
		#include "cpuidle.h"

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@
		#include <linux/cpuidle.h>
		#include <linux/module.h>
		#include <asm/cpuidle.h>
		#include <asm/proc-fns.h>

		#include "common.h"
		#include "cpuidle.h"