ncr5380: Remove DONT_USE_INTR and AUTOPROBE_IRQ macros (a46865dc) · Commits · 戴 / test

drivers/scsi/NCR5380.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -106,9 +106,6 @@
		* DIFFERENTIAL - if defined, NCR53c81 chips will use external differential
		* transceivers.
		*
		* DONT_USE_INTR - if defined, never use interrupts, even if we probe or
		* override-configure an IRQ.
		*
		* PSEUDO_DMA - if defined, PSEUDO DMA is used during the data transfer phases.
		*
		* REAL_DMA - if defined, REAL DMA is used during the data transfer phases.
		@@ -464,9 +461,6 @@ static void prepare_info(struct Scsi_Host *instance)
		hostdata->flags & FLAG_DMA_FIXUP ? "DMA_FIXUP " : "",
		hostdata->flags & FLAG_NO_PSEUDO_DMA ? "NO_PSEUDO_DMA " : "",
		hostdata->flags & FLAG_TOSHIBA_DELAY ? "TOSHIBA_DELAY " : "",
		#ifdef AUTOPROBE_IRQ
		"AUTOPROBE_IRQ "
		#endif
		#ifdef DIFFERENTIAL
		"DIFFERENTIAL "
		#endif
		@@ -915,8 +909,6 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)
		}
		}

		#ifndef DONT_USE_INTR

		/**
		* NCR5380_intr - generic NCR5380 irq handler
		* @irq: interrupt number
		@@ -951,7 +943,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)
		* the Busy Monitor interrupt is enabled together with DMA Mode.
		*/

		static irqreturn_t NCR5380_intr(int irq, void *dev_id)
		static irqreturn_t __maybe_unused NCR5380_intr(int irq, void *dev_id)
		{
		struct Scsi_Host *instance = dev_id;
		struct NCR5380_hostdata *hostdata = shost_priv(instance);
		@@ -1020,8 +1012,6 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
		return IRQ_RETVAL(handled);
		}

		#endif

		/*
		* Function : int NCR5380_select(struct Scsi_Host *instance,
		* struct scsi_cmnd *cmd)

+0 −4

Original line number	Diff line number	Diff line
		@@ -280,16 +280,12 @@ static void NCR5380_print(struct Scsi_Host *instance);
		#define NCR5380_dprint_phase(flg, arg) do {} while (0)
		#endif

		#if defined(AUTOPROBE_IRQ)
		static int NCR5380_probe_irq(struct Scsi_Host *instance, int possible);
		#endif
		static int NCR5380_init(struct Scsi_Host *instance, int flags);
		static int NCR5380_maybe_reset_bus(struct Scsi_Host *);
		static void NCR5380_exit(struct Scsi_Host *instance);
		static void NCR5380_information_transfer(struct Scsi_Host *instance);
		#ifndef DONT_USE_INTR
		static irqreturn_t NCR5380_intr(int irq, void *dev_id);
		#endif
		static void NCR5380_main(struct work_struct *work);
		static const char NCR5380_info(struct Scsi_Host instance);
		static void NCR5380_reselect(struct Scsi_Host *instance);

+0 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@

		#include <scsi/scsi_host.h>

		#define DONT_USE_INTR

		#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)

		#define NCR5380_read(reg) \

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@
		* Definitions for the generic 5380 driver.
		*/

		#define DONT_USE_INTR

		#define NCR5380_read(reg) inb(instance->io_port + reg)
		#define NCR5380_write(reg, value) outb(value, instance->io_port + reg)

+3 −9

Original line number	Diff line number	Diff line
		#define DONT_USE_INTR

		/*
		* DTC 3180/3280 driver, by
		* Ray Van Tassle rayvt@comm.mot.com
		@@ -53,7 +51,6 @@
		#include <scsi/scsi_host.h>

		#include "dtc.h"
		#define AUTOPROBE_IRQ
		#include "NCR5380.h"

		/*
		@@ -243,9 +240,10 @@ found:
		if (instance->irq == 255)
		instance->irq = NO_IRQ;

		#ifndef DONT_USE_INTR
		/* With interrupts enabled, it will sometimes hang when doing heavy
		* reads. So better not enable them until I finger it out. */
		instance->irq = NO_IRQ;

		if (instance->irq != NO_IRQ)
		if (request_irq(instance->irq, dtc_intr, 0,
		"dtc", instance)) {
		@@ -257,11 +255,7 @@ found:
		printk(KERN_WARNING "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no);
		printk(KERN_WARNING "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no);
		}
		#else
		if (instance->irq != NO_IRQ)
		printk(KERN_WARNING "scsi%d : interrupts not used. Might as well not jumper it.\n", instance->host_no);
		instance->irq = NO_IRQ;
		#endif

		dprintk(NDEBUG_INIT, "scsi%d : irq = %d\n",
		instance->host_no, instance->irq);