diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-25 08:47:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:00:58 -0400 |
commit | 9c5f4afdfbe72d5d1c814ad7286a4524d00c7b96 (patch) | |
tree | 7492a9533010d2016ff90a7372465edebcbb0d20 /drivers/scsi/mac_esp.c | |
parent | 35353bb8b869f3a0a153d0674cdafbe4f64aaa05 (diff) |
[PATCH] m68k: convert mac irq code
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/mac_esp.c')
-rw-r--r-- | drivers/scsi/mac_esp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index e31fadd61904..118206d68c6c 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c | |||
@@ -43,9 +43,6 @@ | |||
43 | 43 | ||
44 | /* #define DEBUG_MAC_ESP */ | 44 | /* #define DEBUG_MAC_ESP */ |
45 | 45 | ||
46 | #define mac_turnon_irq(x) mac_enable_irq(x) | ||
47 | #define mac_turnoff_irq(x) mac_disable_irq(x) | ||
48 | |||
49 | extern void esp_handle(struct NCR_ESP *esp); | 46 | extern void esp_handle(struct NCR_ESP *esp); |
50 | extern void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs); | 47 | extern void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs); |
51 | 48 | ||
@@ -639,13 +636,13 @@ static void dma_init_write(struct NCR_ESP * esp, char * vaddress, int length) | |||
639 | 636 | ||
640 | static void dma_ints_off(struct NCR_ESP * esp) | 637 | static void dma_ints_off(struct NCR_ESP * esp) |
641 | { | 638 | { |
642 | mac_turnoff_irq(esp->irq); | 639 | disable_irq(esp->irq); |
643 | } | 640 | } |
644 | 641 | ||
645 | 642 | ||
646 | static void dma_ints_on(struct NCR_ESP * esp) | 643 | static void dma_ints_on(struct NCR_ESP * esp) |
647 | { | 644 | { |
648 | mac_turnon_irq(esp->irq); | 645 | enable_irq(esp->irq); |
649 | } | 646 | } |
650 | 647 | ||
651 | /* | 648 | /* |