openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

m68k/mac: Remove mac_irq_{en,dis}able() wrappers 

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Finn Thain 2011-09-11 23:40:50 +10:00 committed by Geert Uytterhoeven
parent f30a6484f1
commit 2690e2148b
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/asm/macintosh.h
View File

@ -12,6 +12,8 @@ extern void mac_reset(void);
extern void mac_poweroff(void); extern void mac_poweroff(void);
extern void mac_init_IRQ(void); extern void mac_init_IRQ(void);
extern int mac_irq_pending(unsigned int); extern int mac_irq_pending(unsigned int);
extern void mac_irq_enable(struct irq_data *data);
extern void mac_irq_disable(struct irq_data *data);
/* /*
* Floppy driver magic hook - probably shouldn't be here * Floppy driver magic hook - probably shouldn't be here

7
arch/m68k/mac/baboon.c
View File

@ -21,9 +21,6 @@
/* #define DEBUG_IRQS */ /* #define DEBUG_IRQS */
extern void mac_enable_irq(unsigned int);
extern void mac_disable_irq(unsigned int);
int baboon_present; int baboon_present;
static volatile struct baboon *baboon; static volatile struct baboon *baboon;
static unsigned char baboon_disabled; static unsigned char baboon_disabled;
@ -111,7 +108,7 @@ void baboon_irq_enable(int irq)
baboon_disabled &= ~(1 << irq_idx); baboon_disabled &= ~(1 << irq_idx);
if (!baboon_disabled) if (!baboon_disabled)
mac_enable_irq(IRQ_NUBUS_C); mac_irq_enable(irq_get_irq_data(IRQ_NUBUS_C));
} }
void baboon_irq_disable(int irq) void baboon_irq_disable(int irq)
@ -124,7 +121,7 @@ void baboon_irq_disable(int irq)
baboon_disabled |= 1 << irq_idx; baboon_disabled |= 1 << irq_idx;
if (baboon_disabled) if (baboon_disabled)
mac_disable_irq(IRQ_NUBUS_C); mac_irq_disable(irq_get_irq_data(IRQ_NUBUS_C));
} }
void baboon_irq_clear(int irq) void baboon_irq_clear(int irq)

25
arch/m68k/mac/macints.c
View File

@ -190,19 +190,6 @@ irqreturn_t mac_debug_handler(int, void *);
/* #define DEBUG_MACINTS */ /* #define DEBUG_MACINTS */
void mac_enable_irq(unsigned int irq);
void mac_disable_irq(unsigned int irq);
static void mac_irq_enable(struct irq_data *data)
{
mac_enable_irq(data->irq);
}
static void mac_irq_disable(struct irq_data *data)
{
mac_disable_irq(data->irq);
}
static struct irq_chip mac_irq_chip = { static struct irq_chip mac_irq_chip = {
.name = "mac", .name = "mac",
.irq_enable = mac_irq_enable, .irq_enable = mac_irq_enable,
@ -250,16 +237,17 @@ void __init mac_init_IRQ(void)
} }
/* /*
* mac_enable_irq - enable an interrupt source * mac_irq_enable - enable an interrupt source
* mac_disable_irq - disable an interrupt source * mac_irq_disable - disable an interrupt source
* mac_clear_irq - clears a pending interrupt * mac_clear_irq - clears a pending interrupt
* mac_pending_irq - Returns the pending status of an IRQ (nonzero = pending) * mac_irq_pending - returns the pending status of an IRQ (nonzero = pending)
* *
* These routines are just dispatchers to the VIA/OSS/PSC routines. * These routines are just dispatchers to the VIA/OSS/PSC routines.
*/ */
void mac_enable_irq(unsigned int irq) void mac_irq_enable(struct irq_data *data)
{ {
int irq = data->irq;
int irq_src = IRQ_SRC(irq); int irq_src = IRQ_SRC(irq);
switch(irq_src) { switch(irq_src) {
@ -292,8 +280,9 @@ void mac_enable_irq(unsigned int irq)
} }
} }
void mac_disable_irq(unsigned int irq) void mac_irq_disable(struct irq_data *data)
{ {
int irq = data->irq;
int irq_src = IRQ_SRC(irq); int irq_src = IRQ_SRC(irq);
switch(irq_src) { switch(irq_src) {