From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Subject: [PATCH 27/29] ncr5380: Remove ENABLE_IRQ/DISABLE_IRQ macros Date: Thu, 02 Oct 2014 16:56:55 +1000 Message-ID: <20141002065634.726314385@telegraphics.com.au> References: <20141002065628.256592712@telegraphics.com.au> Return-path: Content-Disposition: inline; filename=ncr5380-remove-ENABLE_IRQ-DISABLE_IRQ Sender: linux-scsi-owner@vger.kernel.org To: "James E.J. Bottomley" Cc: Michael Schmitz , Sam Creasey , linux-scsi@vger.kernel.org, linux-m68k@vger.kernel.org List-Id: linux-m68k@vger.kernel.org atari_NCR5380.c enables its IRQ when it is already enabled. Sun3 doesn't use the ENABLE_IRQ/DISABLE_IRQ cruft. Remove it. Signed-off-by: Finn Thain --- drivers/scsi/atari_NCR5380.c | 2 -- drivers/scsi/atari_scsi.c | 21 --------------------- drivers/scsi/sun3_NCR5380.c | 2 -- drivers/scsi/sun3_scsi.c | 7 ------- 4 files changed, 32 deletions(-) Index: linux/drivers/scsi/atari_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/atari_NCR5380.c 2014-10-02 16:56:20.000000000 +1000 +++ linux/drivers/scsi/atari_NCR5380.c 2014-10-02 16:56:24.000000000 +1000 @@ -1226,7 +1226,6 @@ static irqreturn_t NCR5380_intr(int irq, NCR5380_dprint(NDEBUG_INTR, instance); if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { done = 0; - ENABLE_IRQ(); dprintk(NDEBUG_INTR, "scsi%d: SEL interrupt\n", HOSTNO); NCR5380_reselect(instance); (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG); @@ -1256,7 +1255,6 @@ static irqreturn_t NCR5380_intr(int irq, dprintk(NDEBUG_INTR, "scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO); NCR5380_dma_complete( instance ); done = 0; - ENABLE_IRQ(); } else #endif /* REAL_DMA */ { Index: linux/drivers/scsi/atari_scsi.c =================================================================== --- linux.orig/drivers/scsi/atari_scsi.c 2014-10-02 16:56:22.000000000 +1000 +++ linux/drivers/scsi/atari_scsi.c 2014-10-02 16:56:24.000000000 +1000 @@ -157,23 +157,6 @@ static inline unsigned long SCSI_DMA_GET return adr; } -static inline void ENABLE_IRQ(void) -{ - if (IS_A_TT()) - atari_enable_irq(IRQ_TT_MFP_SCSI); - else - atari_enable_irq(IRQ_MFP_FSCSI); -} - -static inline void DISABLE_IRQ(void) -{ - if (IS_A_TT()) - atari_disable_irq(IRQ_TT_MFP_SCSI); - else - atari_disable_irq(IRQ_MFP_FSCSI); -} - - #define HOSTDATA_DMALEN (((struct NCR5380_hostdata *) \ (atari_scsi_host->hostdata))->dma_len) @@ -373,10 +356,6 @@ static irqreturn_t scsi_tt_intr(int irq, NCR5380_intr(irq, dummy); -#if 0 - /* To be sure the int is not masked */ - atari_enable_irq(IRQ_TT_MFP_SCSI); -#endif return IRQ_HANDLED; } Index: linux/drivers/scsi/sun3_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/sun3_NCR5380.c 2014-10-02 16:56:14.000000000 +1000 +++ linux/drivers/scsi/sun3_NCR5380.c 2014-10-02 16:56:24.000000000 +1000 @@ -1153,7 +1153,6 @@ static irqreturn_t NCR5380_intr (int irq NCR5380_dprint(NDEBUG_INTR, instance); if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { done = 0; -// ENABLE_IRQ(); dprintk(NDEBUG_INTR, "scsi%d: SEL interrupt\n", HOSTNO); NCR5380_reselect(instance); (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG); @@ -1186,7 +1185,6 @@ static irqreturn_t NCR5380_intr (int irq dprintk(NDEBUG_INTR, "scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO); NCR5380_dma_complete( instance ); done = 0; -// ENABLE_IRQ(); } else #endif /* REAL_DMA */ { Index: linux/drivers/scsi/sun3_scsi.c =================================================================== --- linux.orig/drivers/scsi/sun3_scsi.c 2014-10-02 16:56:23.000000000 +1000 +++ linux/drivers/scsi/sun3_scsi.c 2014-10-02 16:56:24.000000000 +1000 @@ -72,13 +72,6 @@ extern int sun3_map_test(unsigned long, char *); -#ifdef SUN3_SCSI_VME -#define ENABLE_IRQ() -#else -#define ENABLE_IRQ() enable_irq( IRQ_SUN3_SCSI ); -#endif - - static int setup_can_queue = -1; module_param(setup_can_queue, int, 0); static int setup_cmd_per_lun = -1;