Commit d80c1c0b authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle

[MIPS] i8295 cleanups.

 o Move i8259 function declarations to include/asm-mips/i8259.h
 o Make i8259.c functions static where possible.
Signed-off-by: default avatarYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ec70f65e
...@@ -30,8 +30,10 @@ ...@@ -30,8 +30,10 @@
static int i8259A_auto_eoi = -1; static int i8259A_auto_eoi = -1;
DEFINE_SPINLOCK(i8259A_lock); DEFINE_SPINLOCK(i8259A_lock);
/* some platforms call this... */ static void disable_8259A_irq(unsigned int irq);
void mask_and_ack_8259A(unsigned int); 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 = { static struct irq_chip i8259A_chip = {
.name = "XT-PIC", .name = "XT-PIC",
...@@ -56,7 +58,7 @@ static unsigned int cached_irq_mask = 0xffff; ...@@ -56,7 +58,7 @@ static unsigned int cached_irq_mask = 0xffff;
#define cached_master_mask (cached_irq_mask) #define cached_master_mask (cached_irq_mask)
#define cached_slave_mask (cached_irq_mask >> 8) #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 int mask;
unsigned long flags; unsigned long flags;
...@@ -72,7 +74,7 @@ void disable_8259A_irq(unsigned int irq) ...@@ -72,7 +74,7 @@ void disable_8259A_irq(unsigned int irq)
spin_unlock_irqrestore(&i8259A_lock, flags); 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 int mask;
unsigned long flags; unsigned long flags;
...@@ -142,7 +144,7 @@ static inline int i8259A_irq_real(unsigned int irq) ...@@ -142,7 +144,7 @@ static inline int i8259A_irq_real(unsigned int irq)
* first, _then_ send the EOI, and the order of EOI * first, _then_ send the EOI, and the order of EOI
* to the two 8259s is important! * 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 int irqmask;
unsigned long flags; unsigned long flags;
...@@ -256,7 +258,7 @@ static int __init i8259A_init_sysfs(void) ...@@ -256,7 +258,7 @@ static int __init i8259A_init_sysfs(void)
device_initcall(i8259A_init_sysfs); device_initcall(i8259A_init_sysfs);
void init_8259A(int auto_eoi) static void init_8259A(int auto_eoi)
{ {
unsigned long flags; unsigned long flags;
......
...@@ -8,15 +8,8 @@ ...@@ -8,15 +8,8 @@
#ifndef __ASM_HW_IRQ_H #ifndef __ASM_HW_IRQ_H
#define __ASM_HW_IRQ_H #define __ASM_HW_IRQ_H
#include <linux/profile.h>
#include <asm/atomic.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; extern atomic_t irq_err_count;
/* /*
......
...@@ -37,9 +37,8 @@ ...@@ -37,9 +37,8 @@
extern spinlock_t i8259A_lock; extern spinlock_t i8259A_lock;
extern void init_8259A(int auto_eoi); extern int i8259A_irq_pending(unsigned int irq);
extern void enable_8259A_irq(unsigned int irq); extern void make_8259A_irq(unsigned int irq);
extern void disable_8259A_irq(unsigned int irq);
extern void init_i8259_irqs(void); extern void init_i8259_irqs(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment