[2/4] ARM: remove unnecessary mach/hardware.h includes

Commit Message

Rob Herring June 28, 2011, 10:57 p.m. UTC

From: Rob Herring <[e-mail]>

Remove some includes of mach/hardware.h which are not needed. hardware.h will
be removed completely for tegra and cns3xxx in follow on patch.

Signed-off-by: Rob Herring <[e-mail]>
---
 arch/arm/kernel/ecard.c                   |    1 -
 arch/arm/lib/ecard.S                      |    1 -
 arch/arm/lib/io-readsw-armv3.S            |    1 -
 arch/arm/lib/io-writesw-armv3.S           |    1 -
 arch/arm/mach-cns3xxx/cns3420vb.c         |    1 -
 arch/arm/mach-tegra/include/mach/system.h |    1 -
 arch/arm/mach-tegra/io.c                  |    1 -
 arch/arm/mach-tegra/platsmp.c             |    1 -
 arch/arm/mm/proc-xsc3.S                   |    1 -
 9 files changed, 0 insertions(+), 9 deletions(-)

Comments

Russell King - ARM Linux June 28, 2011, 11:24 p.m. UTC | #1

On Tue, Jun 28, 2011 at 05:57:37PM -0500, Rob Herring wrote:
> From: Rob Herring <[e-mail]>
> 
> Remove some includes of mach/hardware.h which are not needed. hardware.h will
> be removed completely for tegra and cns3xxx in follow on patch.

At least this one is incorrect:

arch/arm/mach-rpc/include/mach/hardware.h:#define IO_EC_MEMC_BASE              0x80000000
arch/arm/kernel/ecard.c:                    address = IO_EC_MEMC_BASE + (slot << 12);

That's just one of the defines that ecard.c uses from mach/hardare.h.

Rob Herring June 29, 2011, 2:41 a.m. UTC | #2

On 06/28/2011 06:24 PM, Russell King - ARM Linux wrote:
> On Tue, Jun 28, 2011 at 05:57:37PM -0500, Rob Herring wrote:
>> From: Rob Herring <[e-mail]>
>>
>> Remove some includes of mach/hardware.h which are not needed. hardware.h will
>> be removed completely for tegra and cns3xxx in follow on patch.
> 
> At least this one is incorrect:
> 
> arch/arm/mach-rpc/include/mach/hardware.h:#define IO_EC_MEMC_BASE              0x80000000
> arch/arm/kernel/ecard.c:                    address = IO_EC_MEMC_BASE + (slot << 12);
> 
> That's just one of the defines that ecard.c uses from mach/hardare.h.
> 
It happens to still compile, so it's getting included thru another
include. I see these options:

-Revert this change. RPC is not going to be built in a multi-platform
kernel anyway. Leaving it could affect how include paths get setup for
multi-platform builds.
-Move ecard.c into mach-rpc. It doesn't appear to be used by anything else.

I'll do the 1st option for now.

Rob

Patch

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index d165001..04b06c1 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -46,7 +46,6 @@ 
 
 #include <asm/dma.h>
 #include <asm/ecard.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mmu_context.h>
 #include <asm/mach/irq.h>
diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S
index 8678eb2..e6057fa 100644
--- a/arch/arm/lib/ecard.S
+++ b/arch/arm/lib/ecard.S
@@ -12,7 +12,6 @@ 
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/hardware.h>
 
 #define CPSR2SPSR(rt) \
 		mrs	rt, cpsr; \
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S
index 9aaf7c7..88487c8 100644
--- a/arch/arm/lib/io-readsw-armv3.S
+++ b/arch/arm/lib/io-readsw-armv3.S
@@ -9,7 +9,6 @@ 
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/hardware.h>
 
 .Linsw_bad_alignment:
 		adr	r0, .Linsw_bad_align_msg
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S
index cd34503..49b8004 100644
--- a/arch/arm/lib/io-writesw-armv3.S
+++ b/arch/arm/lib/io-writesw-armv3.S
@@ -9,7 +9,6 @@ 
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/hardware.h>
 
 .Loutsw_bad_alignment:
 		adr	r0, .Loutsw_bad_align_msg
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c
index 08e5c87..85e6390 100644
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -29,7 +29,6 @@ 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <mach/hardware.h>
 #include <mach/cns3xxx.h>
 #include <mach/irqs.h>
 #include "core.h"
diff --git a/arch/arm/mach-tegra/include/mach/system.h b/arch/arm/mach-tegra/include/mach/system.h
index d0183d8..027c421 100644
--- a/arch/arm/mach-tegra/include/mach/system.h
+++ b/arch/arm/mach-tegra/include/mach/system.h
@@ -21,7 +21,6 @@ 
 #ifndef __MACH_TEGRA_SYSTEM_H
 #define __MACH_TEGRA_SYSTEM_H
 
-#include <mach/hardware.h>
 #include <mach/iomap.h>
 
 extern void (*arch_reset)(char mode, const char *cmd);
diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c
index 31848a9..ea50fe2 100644
--- a/arch/arm/mach-tegra/io.c
+++ b/arch/arm/mach-tegra/io.c
@@ -24,7 +24,6 @@ 
 #include <linux/mm.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/page.h>
 #include <asm/mach/map.h>
 
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index b8ae3c9..deb3851 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -21,7 +21,6 @@ 
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/gic.h>
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/smp_scu.h>
 
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index 5962136..9ab25b4 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -28,7 +28,6 @@ 
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/hwcap.h>
-#include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/page.h>