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

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

[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

arch/mips/kernel/i8259.c

+8 −6
Original line number Diff line number Diff line
@@ -30,8 +30,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",
@@ -56,7 +58,7 @@ static unsigned int cached_irq_mask = 0xffff; 
#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;
@@ -72,7 +74,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;
@@ -142,7 +144,7 @@ static inline int i8259A_irq_real(unsigned int irq) 
 * 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 +258,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;

include/asm-mips/hw_irq.h

+0 −7
Original line number Diff line number Diff line
@@ -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;



/*

include/asm-mips/i8259.h

+2 −3
Original line number Diff line number Diff line
@@ -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);