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

Commit 431d2cd9 authored by Arnaud Patard's avatar Arnaud Patard Committed by Russell King
Browse files

[ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h 

As reminded in http://lkml.org/lkml/2006/12/23/26

, one should use
asm/hardware.h and asm/irq.h but absent-minded devs like me tends to use
asm/arch/hardware.h and/or asm/arch/irqs.h.
This patch aims at preventing such things.

In order to make it work, I had to modify asm-arm/irq.h too so that it can
be included from assembly files.
Also, as a side effect, I had to modify some headers who were using the
asm/arch/hardware.h or asm/arch/irqs.h.

Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eb3b4783

include/asm-arm/arch-s3c2410/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define __ASM_ARCH_DMA_H __FILE__



#include <linux/sysdev.h>

#include "hardware.h"

#include <asm/hardware.h>



/*

 * This is the maximum DMA address(physical address) that can be DMAd to.

include/asm-arm/arch-s3c2410/entry-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define INTOFFSET	(0x14)



#include <asm/hardware.h>

#include <asm/arch/irqs.h>

#include <asm/irq.h>



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

include/asm-arm/arch-s3c2410/hardware.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ 
#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H



#ifndef __ASM_HARDWARE_H

#error "Do not include this directly, instead #include <asm/hardware.h>"

#endif



#ifndef __ASSEMBLY__



/* external functions for GPIO support

include/asm-arm/arch-s3c2410/irqs.h

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
#ifndef __ASM_ARCH_IRQS_H

#define __ASM_ARCH_IRQS_H __FILE__



#ifndef __ASM_ARM_IRQ_H

#error "Do not include this directly, instead #include <asm/irq.h>"

#endif



/* we keep the first set of CPU IRQs out of the range of

 * the ISA space, so that the PC104 has them to itself

include/asm-arm/irq.h

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#define NO_IRQ	((unsigned int)(-1))

#endif



struct irqaction;



/*

 * Migration helpers
@@ -37,6 +36,10 @@ struct irqaction; 
#define IRQT_HIGH	(__IRQT_HIGHLVL)

#define IRQT_PROBE	IRQ_TYPE_PROBE



#ifndef __ASSEMBLY__

struct irqaction;

extern void migrate_irqs(void);

#endif



#endif