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

Commit f5275902 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

ncr5380: Remove ENABLE_IRQ/DISABLE_IRQ macros 



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: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 2231ef87

drivers/scsi/atari_NCR5380.c

+0 −2
Original line number Diff line number Diff line
@@ -1227,7 +1227,6 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) 
		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);
@@ -1257,7 +1256,6 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) 
				dprintk(NDEBUG_INTR, "scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);

				NCR5380_dma_complete( instance );

				done = 0;

				ENABLE_IRQ();

			} else

#endif /* REAL_DMA */

			{

drivers/scsi/atari_scsi.c

+0 −21
Original line number Diff line number Diff line
@@ -157,23 +157,6 @@ static inline unsigned long SCSI_DMA_GETADR(void) 
	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, void *dummy) 


	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;

}

drivers/scsi/sun3_NCR5380.c

+0 −2
Original line number Diff line number Diff line
@@ -1155,7 +1155,6 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id) 
	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);
@@ -1188,7 +1187,6 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id) 
		dprintk(NDEBUG_INTR, "scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);

		NCR5380_dma_complete( instance );

		done = 0;

//		ENABLE_IRQ();

	    } else

#endif /* REAL_DMA */

	    {

drivers/scsi/sun3_scsi.c

+0 −7
Original line number Diff line number Diff line
@@ -69,13 +69,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;