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

Commit 2690e214 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

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



Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent f30a6484

arch/m68k/include/asm/macintosh.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ extern void mac_reset(void); 
extern void mac_poweroff(void);

extern void mac_init_IRQ(void);

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

arch/m68k/mac/baboon.c

+2 −5
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 


/* #define DEBUG_IRQS */



extern void mac_enable_irq(unsigned int);

extern void mac_disable_irq(unsigned int);



int baboon_present;

static volatile struct baboon *baboon;

static unsigned char baboon_disabled;
@@ -111,7 +108,7 @@ void baboon_irq_enable(int irq) 


	baboon_disabled &= ~(1 << irq_idx);

	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)
@@ -124,7 +121,7 @@ void baboon_irq_disable(int irq) 


	baboon_disabled |= 1 << irq_idx;

	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)

arch/m68k/mac/macints.c

+7 −18
Original line number Diff line number Diff line
@@ -190,19 +190,6 @@ irqreturn_t mac_debug_handler(int, void *); 


/* #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 = {

	.name		= "mac",

	.irq_enable	= mac_irq_enable,
@@ -250,16 +237,17 @@ void __init mac_init_IRQ(void) 
}



/*

 *  mac_enable_irq - enable an interrupt source

 * mac_disable_irq - disable an interrupt source

 *  mac_irq_enable - enable an interrupt source

 * mac_irq_disable - disable an interrupt source

 *   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.

 */



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);



	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);



	switch(irq_src) {