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:

committed by
Geert Uytterhoeven

parent
56e63689fd
commit
30c0527d15
@@ -25,6 +25,7 @@
|
||||
#include <asm/dma.h>
|
||||
#include <asm/macints.h>
|
||||
#include <asm/macintosh.h>
|
||||
#include <asm/mac_via.h>
|
||||
|
||||
#include <scsi/scsi_host.h>
|
||||
|
||||
@@ -149,7 +150,7 @@ static inline int mac_esp_wait_for_dreq(struct esp *esp)
|
||||
|
||||
do {
|
||||
if (mep->pdma_regs == NULL) {
|
||||
if (mac_irq_pending(IRQ_MAC_SCSIDRQ))
|
||||
if (via2_scsi_drq_pending())
|
||||
return 0;
|
||||
} else {
|
||||
if (nubus_readl(mep->pdma_regs) & 0x200)
|
||||
|
Reference in New Issue
Block a user