mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 07:12:09 +00:00
m68k/mac: cleanup mac_irq_pending
mac_irq_pending() has only one caller (mac_esp.c). Nothing tests for Baboon, PSC or OSS pending interrupts. Until that need arises, let's keep it simple and remove all the unused abstraction. Replace it with a routine to check for SCSI DRQ. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
56e63689fd
commit
30c0527d15
8 changed files with 11 additions and 101 deletions
|
@ -142,7 +142,6 @@ extern void via_register_interrupts(void);
|
|||
extern void via_irq_enable(int);
|
||||
extern void via_irq_disable(int);
|
||||
extern void via_irq_clear(int);
|
||||
extern int via_irq_pending(int);
|
||||
|
||||
/*
|
||||
* OSS hooks
|
||||
|
@ -152,7 +151,6 @@ extern void oss_register_interrupts(void);
|
|||
extern void oss_irq_enable(int);
|
||||
extern void oss_irq_disable(int);
|
||||
extern void oss_irq_clear(int);
|
||||
extern int oss_irq_pending(int);
|
||||
|
||||
/*
|
||||
* PSC hooks
|
||||
|
@ -162,7 +160,6 @@ extern void psc_register_interrupts(void);
|
|||
extern void psc_irq_enable(int);
|
||||
extern void psc_irq_disable(int);
|
||||
extern void psc_irq_clear(int);
|
||||
extern int psc_irq_pending(int);
|
||||
|
||||
/*
|
||||
* IOP hooks
|
||||
|
@ -239,7 +236,6 @@ void __init mac_init_IRQ(void)
|
|||
/*
|
||||
* mac_irq_enable - enable an interrupt source
|
||||
* mac_irq_disable - disable an interrupt source
|
||||
* mac_irq_pending - returns the pending status of an IRQ (nonzero = pending)
|
||||
*
|
||||
* These routines are just dispatchers to the VIA/OSS/PSC routines.
|
||||
*/
|
||||
|
@ -314,34 +310,6 @@ void mac_irq_disable(struct irq_data *data)
|
|||
}
|
||||
}
|
||||
|
||||
int mac_irq_pending(unsigned int irq)
|
||||
{
|
||||
switch(IRQ_SRC(irq)) {
|
||||
case 1:
|
||||
return via_irq_pending(irq);
|
||||
case 2:
|
||||
case 7:
|
||||
if (oss_present)
|
||||
return oss_irq_pending(irq);
|
||||
else
|
||||
return via_irq_pending(irq);
|
||||
case 3:
|
||||
case 5:
|
||||
case 6:
|
||||
if (psc_present)
|
||||
return psc_irq_pending(irq);
|
||||
else if (oss_present)
|
||||
return oss_irq_pending(irq);
|
||||
break;
|
||||
case 4:
|
||||
if (psc_present)
|
||||
return psc_irq_pending(irq);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(mac_irq_pending);
|
||||
|
||||
static int num_debug[8];
|
||||
|
||||
irqreturn_t mac_debug_handler(int irq, void *dev_id)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue