Move i8259 functions to include/asm-mips/i8259.h
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/kernel/i8259.c
mips/arch/mips/kernel/i8259.c
--- mips-orig/arch/mips/kernel/i8259.c 2007-09-12 14:37:15.447287000 +0900
+++ mips/arch/mips/kernel/i8259.c 2007-09-12 14:26:42.007699500 +0900
@@ -31,7 +31,10 @@
static int i8259A_auto_eoi = -1;
DEFINE_SPINLOCK(i8259A_lock);
/* some platforms call this... */
-void mask_and_ack_8259A(unsigned int);
+static void disable_8259A_irq(unsigned int irq);
+static void enable_8259A_irq(unsigned int irq);
+static void mask_and_ack_8259A(unsigned int irq);
+static void init_8259A(int auto_eoi);
static struct irq_chip i8259A_chip = {
.name = "XT-PIC",
@@ -53,7 +56,7 @@ static unsigned int cached_irq_mask = 0x
#define cached_master_mask (cached_irq_mask)
#define cached_slave_mask (cached_irq_mask >> 8)
-void disable_8259A_irq(unsigned int irq)
+static void disable_8259A_irq(unsigned int irq)
{
unsigned int mask;
unsigned long flags;
@@ -69,7 +72,7 @@ void disable_8259A_irq(unsigned int irq)
spin_unlock_irqrestore(&i8259A_lock, flags);
}
-void enable_8259A_irq(unsigned int irq)
+static void enable_8259A_irq(unsigned int irq)
{
unsigned int mask;
unsigned long flags;
@@ -139,7 +142,7 @@ static inline int i8259A_irq_real(unsign
* first, _then_ send the EOI, and the order of EOI
* to the two 8259s is important!
*/
-void mask_and_ack_8259A(unsigned int irq)
+static void mask_and_ack_8259A(unsigned int irq)
{
unsigned int irqmask;
unsigned long flags;
@@ -256,7 +259,7 @@ static int __init i8259A_init_sysfs(void
device_initcall(i8259A_init_sysfs);
-void init_8259A(int auto_eoi)
+static void init_8259A(int auto_eoi)
{
unsigned long flags;
diff -pruN -X mips/Documentation/dontdiff mips-orig/include/asm-mips/hw_irq.h
mips/include/asm-mips/hw_irq.h
--- mips-orig/include/asm-mips/hw_irq.h 2007-09-12 14:37:15.459287750 +0900
+++ mips/include/asm-mips/hw_irq.h 2007-09-12 14:26:01.485167000 +0900
@@ -8,15 +8,8 @@
#ifndef __ASM_HW_IRQ_H
#define __ASM_HW_IRQ_H
-#include <linux/profile.h>
#include <asm/atomic.h>
-extern void disable_8259A_irq(unsigned int irq);
-extern void enable_8259A_irq(unsigned int irq);
-extern int i8259A_irq_pending(unsigned int irq);
-extern void make_8259A_irq(unsigned int irq);
-extern void init_8259A(int aeoi);
-
extern atomic_t irq_err_count;
/*
diff -pruN -X mips/Documentation/dontdiff mips-orig/include/asm-mips/i8259.h
mips/include/asm-mips/i8259.h
--- mips-orig/include/asm-mips/i8259.h 2007-09-12 14:37:15.475288750 +0900
+++ mips/include/asm-mips/i8259.h 2007-09-12 14:26:01.485167000 +0900
@@ -37,9 +37,8 @@
extern spinlock_t i8259A_lock;
-extern void init_8259A(int auto_eoi);
-extern void enable_8259A_irq(unsigned int irq);
-extern void disable_8259A_irq(unsigned int irq);
+extern int i8259A_irq_pending(unsigned int irq);
+extern void make_8259A_irq(unsigned int irq);
extern void init_i8259_irqs(void);
|