diff for duplicates of <20030902184436.GO23729@fs.tum.de> diff --git a/a/1.txt b/N1/1.txt index 3ccd4a3..2f89e3b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -404,413 +404,3 @@ Adrian #define MAX_ADAPTER_NUM 4 #define MAX_SG_LIST_BUF 16 /* Not used */ -- -To unsubscribe from this list: send the line "unsubscribe linux-scsi" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -On Wed, Aug 27, 2003 at 02:52:45PM -0300, Marcelo Tosatti wrote: ->... -> Summary of changes from v2.4.22 to v2.4.23-pre1 -> ============================================ ->... -> Arnaldo Carvalho de Melo: -> o irqreturn_t compatibility with 2.6 ->... - -This change added an (empty) IRQ_NONE #define to interrupt.h. - -Several scsi drivers are already using an IRQ_NONE. Rename that to -SCSI_IRQ_NONE (a similar change was done in 2.5 by Andrew Morton several -months ago). - -I've tested the compilation with 2.4.23-pre2. - -Please apply -Adrian - ---- linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.c.old 2003-09-02 20:27:14.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.c 2003-09-02 20:27:25.000000000 +0200 -@@ -6397,7 +6397,7 @@ - (struct NCR53c7x0_hostdata *) host->hostdata; - struct NCR53c7x0_cmd *cmd, *tmp; - shutdown (host); -- if (host->irq != IRQ_NONE) -+ if (host->irq != SCSI_IRQ_NONE) - { - int irq_count; - struct Scsi_Host *tmp; ---- linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.h.old 2003-09-02 20:27:25.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.h 2003-09-02 20:27:33.000000000 +0200 -@@ -1428,7 +1428,7 @@ - - }; - --#define IRQ_NONE 255 -+#define SCSI_IRQ_NONE 255 - #define DMA_NONE 255 - #define IRQ_AUTO 254 - #define DMA_AUTO 254 ---- linux-2.4.23-pre2-full/drivers/scsi/53c7xx.c.old 2003-09-02 20:27:33.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/53c7xx.c 2003-09-02 20:27:42.000000000 +0200 -@@ -6081,7 +6081,7 @@ - (struct NCR53c7x0_hostdata *) host->hostdata[0]; - struct NCR53c7x0_cmd *cmd, *tmp; - shutdown (host); -- if (host->irq != IRQ_NONE) -+ if (host->irq != SCSI_IRQ_NONE) - { - int irq_count; - struct Scsi_Host *tmp; ---- linux-2.4.23-pre2-full/drivers/scsi/53c7xx.h.old 2003-09-02 20:27:42.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/53c7xx.h 2003-09-02 20:27:49.000000000 +0200 -@@ -1450,7 +1450,7 @@ - - }; - --#define IRQ_NONE 255 -+#define SCSI_IRQ_NONE 255 - #define DMA_NONE 255 - #define IRQ_AUTO 254 - #define DMA_AUTO 254 ---- linux-2.4.23-pre2-full/drivers/scsi/NCR5380.c.old 2003-09-02 20:27:49.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/NCR5380.c 2003-09-02 20:32:27.000000000 +0200 -@@ -693,7 +693,7 @@ - trying_irqs |= mask; - - timeout = jiffies + (250 * HZ / 1000); -- probe_irq = IRQ_NONE; -+ probe_irq = SCSI_IRQ_NONE; - - /* - * A interrupt is triggered whenever BSY = false, SEL = true -@@ -710,7 +710,7 @@ - NCR5380_write(OUTPUT_DATA_REG, hostdata->id_mask); - NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA | ICR_ASSERT_SEL); - -- while (probe_irq == IRQ_NONE && time_before(jiffies, timeout)) -+ while (probe_irq == SCSI_IRQ_NONE && time_before(jiffies, timeout)) - barrier(); - - NCR5380_write(SELECT_ENABLE_REG, 0); -@@ -860,7 +860,7 @@ - - SPRINTF("\nBase Addr: 0x%05lX ", (long) instance->base); - SPRINTF("io_port: %04x ", (int) instance->io_port); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - SPRINTF("IRQ: None.\n"); - else - SPRINTF("IRQ: %d.\n", instance->irq); -@@ -1706,7 +1706,7 @@ - #endif /* def NCR_TIMEOUT */ - - dprintk(NDEBUG_SELECTION, ("scsi%d : target %d selected, going into MESSAGE OUT phase.\n", instance->host_no, cmd->target)); -- tmp[0] = IDENTIFY(((instance->irq == IRQ_NONE) ? 0 : 1), cmd->lun); -+ tmp[0] = IDENTIFY(((instance->irq == SCSI_IRQ_NONE) ? 0 : 1), cmd->lun); - - len = 1; - cmd->tag = 0; ---- linux-2.4.23-pre2-full/drivers/scsi/dmx3191d.c.old 2003-09-02 20:27:59.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/dmx3191d.c 2003-09-02 20:33:02.000000000 +0200 -@@ -96,7 +96,7 @@ - printk(KERN_WARNING "dmx3191: IRQ %d not available - switching to polled mode.\n", pdev->irq); - /* Steam powered scsi controllers run without an IRQ - anyway */ -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - } - - boards++; -@@ -113,7 +113,7 @@ - int dmx3191d_release_resources(struct Scsi_Host *instance) - { - release_region(instance->io_port, DMX3191D_REGION); -- if(instance->irq!=IRQ_NONE) -+ if(instance->irq != SCSI_IRQ_NONE) - free_irq(instance->irq, instance); - - return 0; ---- linux-2.4.23-pre2-full/drivers/scsi/dtc.c.old 2003-09-02 20:28:12.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/dtc.c 2003-09-02 20:29:03.000000000 +0200 -@@ -261,24 +261,24 @@ - #ifndef DONT_USE_INTR - /* With interrupts enabled, it will sometimes hang when doing heavy - * reads. So better not enable them until I figure it out. */ -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, do_dtc_intr, SA_INTERRUPT, "dtc")) - { - printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - } - -- if (instance->irq == IRQ_NONE) { -+ if (instance->irq == SCSI_IRQ_NONE) { - printk(KERN_INFO "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no); - printk(KERN_INFO "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no); - } - #else -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - printk(KERN_INFO "scsi%d : interrupts not used. Might as well not jumper it.\n", instance->host_no); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - #endif - printk(KERN_INFO "scsi%d : at 0x%05X", instance->host_no, (int) instance->base); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk(" interrupts disabled"); - else - printk(" irq %d", instance->irq); -@@ -336,7 +336,7 @@ - i = 0; - NCR5380_read(RESET_PARITY_INTERRUPT_REG); - NCR5380_write(MODE_REG, MR_ENABLE_EOP_INTR | MR_DMA_MODE); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - NCR5380_write(DTC_CONTROL_REG, CSR_DIR_READ); - else - NCR5380_write(DTC_CONTROL_REG, CSR_DIR_READ | CSR_INT_BASE); -@@ -384,7 +384,7 @@ - NCR5380_read(RESET_PARITY_INTERRUPT_REG); - NCR5380_write(MODE_REG, MR_ENABLE_EOP_INTR | MR_DMA_MODE); - /* set direction (write) */ -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - NCR5380_write(DTC_CONTROL_REG, 0); - else - NCR5380_write(DTC_CONTROL_REG, CSR_5380_INTR); ---- linux-2.4.23-pre2-full/drivers/scsi/g_NCR5380.c.old 2003-09-02 20:29:03.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/g_NCR5380.c 2003-09-02 20:33:26.000000000 +0200 -@@ -333,7 +333,7 @@ - if (dev->irq_resource[0].flags & IORESOURCE_IRQ) - overrides[count].irq = dev->irq_resource[0].start; - else -- overrides[count].irq = IRQ_NONE; -+ overrides[count].irq = SCSI_IRQ_NONE; - if (dev->dma_resource[0].flags & IORESOURCE_DMA) - overrides[count].dma = dev->dma_resource[0].start; - else -@@ -430,19 +430,19 @@ - else - instance->irq = NCR5380_probe_irq(instance, 0xffff); - -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, do_generic_NCR5380_intr, SA_INTERRUPT, "NCR5380", NULL)) { - printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - } - -- if (instance->irq == IRQ_NONE) { -+ if (instance->irq == SCSI_IRQ_NONE) { - printk(KERN_INFO "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no); - printk(KERN_INFO "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no); - } - - printk(KERN_INFO "scsi%d : at " STRVAL(NCR5380_map_name) " 0x%x", instance->host_no, (unsigned int) instance->NCR5380_instance_name); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk(" interrupts disabled"); - else - printk(" irq %d", instance->irq); -@@ -489,7 +489,7 @@ - release_mem_region(instance->NCR5380_instance_name, NCR5380_region_size); - #endif - -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - free_irq(instance->irq, NULL); - - return 0; -@@ -802,7 +802,7 @@ - PRINTP("NO NCR53C400 driver extensions\n"); - #endif - PRINTP("Using %s mapping at %s 0x%lx, " ANDP STRVAL(NCR5380_map_config) ANDP STRVAL(NCR5380_map_name) ANDP scsi_ptr->NCR5380_instance_name); -- if (scsi_ptr->irq == IRQ_NONE) -+ if (scsi_ptr->irq == SCSI_IRQ_NONE) - PRINTP("no interrupt\n"); - else - PRINTP("on interrupt %d\n" ANDP scsi_ptr->irq); ---- linux-2.4.23-pre2-full/drivers/scsi/mac_scsi.c.old 2003-09-02 20:29:11.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/mac_scsi.c 2003-09-02 20:29:32.000000000 +0200 -@@ -253,16 +253,16 @@ - - ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0; - -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, NCR5380_intr, IRQ_FLG_SLOW, - "ncr5380", NCR5380_intr)) { - printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n", - instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - } - - printk(KERN_INFO "scsi%d: generic 5380 at port %lX irq", instance->host_no, instance->io_port); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk (KERN_INFO "s disabled"); - else - printk (KERN_INFO " %d", instance->irq); -@@ -277,7 +277,7 @@ - - int macscsi_release (struct Scsi_Host *shpnt) - { -- if (shpnt->irq != IRQ_NONE) -+ if (shpnt->irq != SCSI_IRQ_NONE) - free_irq (shpnt->irq, NCR5380_intr); - - return 0; ---- linux-2.4.23-pre2-full/drivers/scsi/pas16.c.old 2003-09-02 20:29:32.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/pas16.c 2003-09-02 20:30:00.000000000 +0200 -@@ -99,11 +99,11 @@ - * interrupts. Ie, for a board at the default 0x388 base port, - * boot: linux pas16=0x388,255 - * -- * IRQ_NONE (255) should be specified for no interrupt, -+ * SCSI_IRQ_NONE (255) should be specified for no interrupt, - * IRQ_AUTO (254) to autoprobe for an IRQ line if overridden - * on the command line. - * -- * (IRQ_AUTO == 254, IRQ_NONE == 255 in NCR5380.h) -+ * (IRQ_AUTO == 254, SCSI_IRQ_NONE == 255 in NCR5380.h) - */ - - #include <linux/module.h> -@@ -404,13 +404,13 @@ - else - instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS); - -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, do_pas16_intr, SA_INTERRUPT, "pas16", NULL)) { - printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - } - -- if (instance->irq == IRQ_NONE) { -+ if (instance->irq == SCSI_IRQ_NONE) { - printk(KERN_INFO "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no); - printk(KERN_INFO "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no); - /* Disable 5380 interrupts, leave drive params the same */ -@@ -420,7 +420,7 @@ - - printk(KERN_INFO "scsi%d : at 0x%04x", instance->host_no, (int) - instance->io_port); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk(" interrupts disabled"); - else - printk(" irq %d", instance->irq); ---- linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi.c.old 2003-09-02 20:30:00.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi.c 2003-09-02 20:30:16.000000000 +0200 -@@ -267,7 +267,7 @@ - #ifndef REAL_DMA - printk("scsi%d: IRQ%d not free, interrupts disabled\n", - instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - #else - printk("scsi%d: IRQ%d not free, bailing out\n", - instance->host_no, instance->irq); -@@ -276,7 +276,7 @@ - } - - printk("scsi%d: Sun3 5380 at port %lX irq", instance->host_no, instance->io_port); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk ("s disabled"); - else - printk (" %d", instance->irq); -@@ -305,7 +305,7 @@ - #ifdef MODULE - int sun3scsi_release (struct Scsi_Host *shpnt) - { -- if (shpnt->irq != IRQ_NONE) -+ if (shpnt->irq != SCSI_IRQ_NONE) - free_irq (shpnt->irq, NULL); - - iounmap((void *)sun3_scsi_regp); ---- linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi_vme.c.old 2003-09-02 20:30:16.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi_vme.c 2003-09-02 20:30:37.000000000 +0200 -@@ -236,7 +236,7 @@ - #ifndef REAL_DMA - printk("scsi%d: IRQ%d not free, interrupts disabled\n", - instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - #else - printk("scsi%d: IRQ%d not free, bailing out\n", - instance->host_no, instance->irq); -@@ -245,7 +245,7 @@ - } - - printk("scsi%d: Sun3 5380 VME at port %lX irq", instance->host_no, instance->io_port); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk ("s disabled"); - else - printk (" %d", instance->irq); -@@ -281,7 +281,7 @@ - #ifdef MODULE - int sun3scsi_release (struct Scsi_Host *shpnt) - { -- if (shpnt->irq != IRQ_NONE) -+ if (shpnt->irq != SCSI_IRQ_NONE) - free_irq (shpnt->irq, NULL); - - iounmap(sun3_scsi_regp); ---- linux-2.4.23-pre2-full/drivers/scsi/t128.c.old 2003-09-02 20:30:37.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/t128.c 2003-09-02 20:30:59.000000000 +0200 -@@ -237,20 +237,20 @@ - else - instance->irq = NCR5380_probe_irq(instance, T128_IRQS); - -- if (instance->irq != IRQ_NONE) -+ if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, do_t128_intr, SA_INTERRUPT, "t128", NULL)) - { - printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); -- instance->irq = IRQ_NONE; -+ instance->irq = SCSI_IRQ_NONE; - } - -- if (instance->irq == IRQ_NONE) { -+ if (instance->irq == SCSI_IRQ_NONE) { - printk(KERN_INFO "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no); - printk(KERN_INFO "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no); - } - - printk(KERN_INFO "scsi%d : at 0x%08lx", instance->host_no,instance->base); -- if (instance->irq == IRQ_NONE) -+ if (instance->irq == SCSI_IRQ_NONE) - printk(" interrupts disabled"); - else - printk(" irq %d", instance->irq); ---- linux-2.4.23-pre2-full/drivers/scsi/tmscsim.c.old 2003-09-02 20:30:59.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/tmscsim.c 2003-09-02 20:31:05.000000000 +0200 -@@ -3047,7 +3047,7 @@ - /* TO DO: We should check for outstanding commands first. */ - dc390_shutdown (host); - -- if (host->irq != IRQ_NONE) -+ if (host->irq != SCSI_IRQ_NONE) - { - DEBUG0(printk(KERN_INFO "DC390: Free IRQ %i\n",host->irq);) - free_irq (host->irq, pACB); ---- linux-2.4.23-pre2-full/drivers/scsi/tmscsim.h.old 2003-09-02 20:31:05.000000000 +0200 -+++ linux-2.4.23-pre2-full/drivers/scsi/tmscsim.h 2003-09-02 20:31:21.000000000 +0200 -@@ -11,7 +11,7 @@ - #include <linux/types.h> - #include <linux/config.h> - --#define IRQ_NONE 255 -+#define SCSI_IRQ_NONE 255 - - #define MAX_ADAPTER_NUM 4 - #define MAX_SG_LIST_BUF 16 /* Not used */ diff --git a/a/content_digest b/N1/content_digest index 9b933f4..f9a42ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -414,416 +414,6 @@ "+#define SCSI_IRQ_NONE 255\n" " \n" " #define MAX_ADAPTER_NUM \t4\n" - " #define MAX_SG_LIST_BUF \t16\t/* Not used */\n" - "-\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-scsi\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - "More majordomo info at http://vger.kernel.org/majordomo-info.html\n" - "On Wed, Aug 27, 2003 at 02:52:45PM -0300, Marcelo Tosatti wrote:\n" - ">...\n" - "> Summary of changes from v2.4.22 to v2.4.23-pre1\n" - "> ============================================\n" - ">...\n" - "> Arnaldo Carvalho de Melo:\n" - "> o irqreturn_t compatibility with 2.6\n" - ">...\n" - "\n" - "This change added an (empty) IRQ_NONE #define to interrupt.h.\n" - "\n" - "Several scsi drivers are already using an IRQ_NONE. Rename that to\n" - "SCSI_IRQ_NONE (a similar change was done in 2.5 by Andrew Morton several\n" - "months ago).\n" - "\n" - "I've tested the compilation with 2.4.23-pre2.\n" - "\n" - "Please apply\n" - "Adrian\n" - "\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.c.old\t2003-09-02 20:27:14.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.c\t2003-09-02 20:27:25.000000000 +0200\n" - "@@ -6397,7 +6397,7 @@\n" - " \t(struct NCR53c7x0_hostdata *) host->hostdata;\n" - " struct NCR53c7x0_cmd *cmd, *tmp;\n" - " shutdown (host);\n" - "- if (host->irq != IRQ_NONE)\n" - "+ if (host->irq != SCSI_IRQ_NONE)\n" - " \t{\n" - " \t int irq_count;\n" - " \t struct Scsi_Host *tmp;\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.h.old\t2003-09-02 20:27:25.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/53c7,8xx.h\t2003-09-02 20:27:33.000000000 +0200\n" - "@@ -1428,7 +1428,7 @@\n" - " \n" - " };\n" - " \n" - "-#define IRQ_NONE\t255\n" - "+#define SCSI_IRQ_NONE\t255\n" - " #define DMA_NONE\t255\n" - " #define IRQ_AUTO\t254\n" - " #define DMA_AUTO\t254\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/53c7xx.c.old\t2003-09-02 20:27:33.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/53c7xx.c\t2003-09-02 20:27:42.000000000 +0200\n" - "@@ -6081,7 +6081,7 @@\n" - " \t(struct NCR53c7x0_hostdata *) host->hostdata[0];\n" - " struct NCR53c7x0_cmd *cmd, *tmp;\n" - " shutdown (host);\n" - "- if (host->irq != IRQ_NONE)\n" - "+ if (host->irq != SCSI_IRQ_NONE)\n" - " \t{\n" - " \t int irq_count;\n" - " \t struct Scsi_Host *tmp;\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/53c7xx.h.old\t2003-09-02 20:27:42.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/53c7xx.h\t2003-09-02 20:27:49.000000000 +0200\n" - "@@ -1450,7 +1450,7 @@\n" - " \n" - " };\n" - " \n" - "-#define IRQ_NONE\t255\n" - "+#define SCSI_IRQ_NONE\t255\n" - " #define DMA_NONE\t255\n" - " #define IRQ_AUTO\t254\n" - " #define DMA_AUTO\t254\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/NCR5380.c.old\t2003-09-02 20:27:49.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/NCR5380.c\t2003-09-02 20:32:27.000000000 +0200\n" - "@@ -693,7 +693,7 @@\n" - " \t\t\ttrying_irqs |= mask;\n" - " \n" - " \ttimeout = jiffies + (250 * HZ / 1000);\n" - "-\tprobe_irq = IRQ_NONE;\n" - "+\tprobe_irq = SCSI_IRQ_NONE;\n" - " \n" - " \t/*\n" - " \t * A interrupt is triggered whenever BSY = false, SEL = true\n" - "@@ -710,7 +710,7 @@\n" - " \tNCR5380_write(OUTPUT_DATA_REG, hostdata->id_mask);\n" - " \tNCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA | ICR_ASSERT_SEL);\n" - " \n" - "-\twhile (probe_irq == IRQ_NONE && time_before(jiffies, timeout))\n" - "+\twhile (probe_irq == SCSI_IRQ_NONE && time_before(jiffies, timeout))\n" - " \t\tbarrier();\n" - " \n" - " \tNCR5380_write(SELECT_ENABLE_REG, 0);\n" - "@@ -860,7 +860,7 @@\n" - " \n" - " \tSPRINTF(\"\\nBase Addr: 0x%05lX \", (long) instance->base);\n" - " \tSPRINTF(\"io_port: %04x \", (int) instance->io_port);\n" - "-\tif (instance->irq == IRQ_NONE)\n" - "+\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\tSPRINTF(\"IRQ: None.\\n\");\n" - " \telse\n" - " \t\tSPRINTF(\"IRQ: %d.\\n\", instance->irq);\n" - "@@ -1706,7 +1706,7 @@\n" - " #endif\t\t\t\t/* def NCR_TIMEOUT */\n" - " \n" - " \tdprintk(NDEBUG_SELECTION, (\"scsi%d : target %d selected, going into MESSAGE OUT phase.\\n\", instance->host_no, cmd->target));\n" - "-\ttmp[0] = IDENTIFY(((instance->irq == IRQ_NONE) ? 0 : 1), cmd->lun);\n" - "+\ttmp[0] = IDENTIFY(((instance->irq == SCSI_IRQ_NONE) ? 0 : 1), cmd->lun);\n" - " \n" - " \tlen = 1;\n" - " \tcmd->tag = 0;\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/dmx3191d.c.old\t2003-09-02 20:27:59.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/dmx3191d.c\t2003-09-02 20:33:02.000000000 +0200\n" - "@@ -96,7 +96,7 @@\n" - " \t\t\tprintk(KERN_WARNING \"dmx3191: IRQ %d not available - switching to polled mode.\\n\", pdev->irq);\n" - " \t\t\t/* Steam powered scsi controllers run without an IRQ\n" - " \t\t\t anyway */\n" - "-\t\t\tinstance->irq = IRQ_NONE;\n" - "+\t\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " \t\t}\n" - " \n" - " \t\tboards++;\n" - "@@ -113,7 +113,7 @@\n" - " int dmx3191d_release_resources(struct Scsi_Host *instance)\n" - " {\n" - " \trelease_region(instance->io_port, DMX3191D_REGION);\n" - "-\tif(instance->irq!=IRQ_NONE)\n" - "+\tif(instance->irq != SCSI_IRQ_NONE)\n" - " \t\tfree_irq(instance->irq, instance);\n" - " \n" - " \treturn 0;\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/dtc.c.old\t2003-09-02 20:28:12.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/dtc.c\t2003-09-02 20:29:03.000000000 +0200\n" - "@@ -261,24 +261,24 @@\n" - " #ifndef DONT_USE_INTR\n" - " \t\t/* With interrupts enabled, it will sometimes hang when doing heavy\n" - " \t\t * reads. So better not enable them until I figure it out. */\n" - "-\t\tif (instance->irq != IRQ_NONE)\n" - "+\t\tif (instance->irq != SCSI_IRQ_NONE)\n" - " \t\t\tif (request_irq(instance->irq, do_dtc_intr, SA_INTERRUPT, \"dtc\")) \n" - " \t\t\t{\n" - " \t\t\t\tprintk(KERN_WARNING \"scsi%d : IRQ%d not free, interrupts disabled\\n\", instance->host_no, instance->irq);\n" - "-\t\t\t\tinstance->irq = IRQ_NONE;\n" - "+\t\t\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " \t\t\t}\n" - " \n" - "-\t\tif (instance->irq == IRQ_NONE) {\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE) {\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : interrupts not enabled. for better interactive performance,\\n\", instance->host_no);\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : please jumper the board for a free IRQ.\\n\", instance->host_no);\n" - " \t\t}\n" - " #else\n" - "-\t\tif (instance->irq != IRQ_NONE)\n" - "+\t\tif (instance->irq != SCSI_IRQ_NONE)\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : interrupts not used. Might as well not jumper it.\\n\", instance->host_no);\n" - "-\t\tinstance->irq = IRQ_NONE;\n" - "+\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " #endif\n" - " \t\tprintk(KERN_INFO \"scsi%d : at 0x%05X\", instance->host_no, (int) instance->base);\n" - "-\t\tif (instance->irq == IRQ_NONE)\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\t\tprintk(\" interrupts disabled\");\n" - " \t\telse\n" - " \t\t\tprintk(\" irq %d\", instance->irq);\n" - "@@ -336,7 +336,7 @@\n" - " \ti = 0;\n" - " \tNCR5380_read(RESET_PARITY_INTERRUPT_REG);\n" - " \tNCR5380_write(MODE_REG, MR_ENABLE_EOP_INTR | MR_DMA_MODE);\n" - "-\tif (instance->irq == IRQ_NONE)\n" - "+\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\tNCR5380_write(DTC_CONTROL_REG, CSR_DIR_READ);\n" - " \telse\n" - " \t\tNCR5380_write(DTC_CONTROL_REG, CSR_DIR_READ | CSR_INT_BASE);\n" - "@@ -384,7 +384,7 @@\n" - " \tNCR5380_read(RESET_PARITY_INTERRUPT_REG);\n" - " \tNCR5380_write(MODE_REG, MR_ENABLE_EOP_INTR | MR_DMA_MODE);\n" - " \t/* set direction (write) */\n" - "-\tif (instance->irq == IRQ_NONE)\n" - "+\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\tNCR5380_write(DTC_CONTROL_REG, 0);\n" - " \telse\n" - " \t\tNCR5380_write(DTC_CONTROL_REG, CSR_5380_INTR);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/g_NCR5380.c.old\t2003-09-02 20:29:03.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/g_NCR5380.c\t2003-09-02 20:33:26.000000000 +0200\n" - "@@ -333,7 +333,7 @@\n" - " \t\t\tif (dev->irq_resource[0].flags & IORESOURCE_IRQ)\n" - " \t\t\t\toverrides[count].irq = dev->irq_resource[0].start;\n" - " \t\t\telse\n" - "-\t\t\t\toverrides[count].irq = IRQ_NONE;\n" - "+\t\t\t\toverrides[count].irq = SCSI_IRQ_NONE;\n" - " \t\t\tif (dev->dma_resource[0].flags & IORESOURCE_DMA)\n" - " \t\t\t\toverrides[count].dma = dev->dma_resource[0].start;\n" - " \t\t\telse\n" - "@@ -430,19 +430,19 @@\n" - " \t\telse\n" - " \t\t\tinstance->irq = NCR5380_probe_irq(instance, 0xffff);\n" - " \n" - "-\t\tif (instance->irq != IRQ_NONE)\n" - "+\t\tif (instance->irq != SCSI_IRQ_NONE)\n" - " \t\t\tif (request_irq(instance->irq, do_generic_NCR5380_intr, SA_INTERRUPT, \"NCR5380\", NULL)) {\n" - " \t\t\t\tprintk(KERN_WARNING \"scsi%d : IRQ%d not free, interrupts disabled\\n\", instance->host_no, instance->irq);\n" - "-\t\t\t\tinstance->irq = IRQ_NONE;\n" - "+\t\t\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " \t\t\t}\n" - " \n" - "-\t\tif (instance->irq == IRQ_NONE) {\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE) {\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : interrupts not enabled. for better interactive performance,\\n\", instance->host_no);\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : please jumper the board for a free IRQ.\\n\", instance->host_no);\n" - " \t\t}\n" - " \n" - " \t\tprintk(KERN_INFO \"scsi%d : at \" STRVAL(NCR5380_map_name) \" 0x%x\", instance->host_no, (unsigned int) instance->NCR5380_instance_name);\n" - "-\t\tif (instance->irq == IRQ_NONE)\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\t\tprintk(\" interrupts disabled\");\n" - " \t\telse\n" - " \t\t\tprintk(\" irq %d\", instance->irq);\n" - "@@ -489,7 +489,7 @@\n" - " \trelease_mem_region(instance->NCR5380_instance_name, NCR5380_region_size);\n" - " #endif\n" - " \n" - "-\tif (instance->irq != IRQ_NONE)\n" - "+\tif (instance->irq != SCSI_IRQ_NONE)\n" - " \t\tfree_irq(instance->irq, NULL);\n" - " \n" - " \treturn 0;\n" - "@@ -802,7 +802,7 @@\n" - " \tPRINTP(\"NO NCR53C400 driver extensions\\n\");\n" - " #endif\n" - " \tPRINTP(\"Using %s mapping at %s 0x%lx, \" ANDP STRVAL(NCR5380_map_config) ANDP STRVAL(NCR5380_map_name) ANDP scsi_ptr->NCR5380_instance_name);\n" - "-\tif (scsi_ptr->irq == IRQ_NONE)\n" - "+\tif (scsi_ptr->irq == SCSI_IRQ_NONE)\n" - " \t\tPRINTP(\"no interrupt\\n\");\n" - " \telse\n" - " \t\tPRINTP(\"on interrupt %d\\n\" ANDP scsi_ptr->irq);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/mac_scsi.c.old\t2003-09-02 20:29:11.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/mac_scsi.c\t2003-09-02 20:29:32.000000000 +0200\n" - "@@ -253,16 +253,16 @@\n" - " \n" - " ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;\n" - " \n" - "- if (instance->irq != IRQ_NONE)\n" - "+ if (instance->irq != SCSI_IRQ_NONE)\n" - " \tif (request_irq(instance->irq, NCR5380_intr, IRQ_FLG_SLOW, \n" - " \t\t\"ncr5380\", NCR5380_intr)) {\n" - " \t printk(KERN_WARNING \"scsi%d: IRQ%d not free, interrupts disabled\\n\",\n" - " \t\t instance->host_no, instance->irq);\n" - "-\t instance->irq = IRQ_NONE;\n" - "+\t instance->irq = SCSI_IRQ_NONE;\n" - " \t}\n" - " \n" - " printk(KERN_INFO \"scsi%d: generic 5380 at port %lX irq\", instance->host_no, instance->io_port);\n" - "- if (instance->irq == IRQ_NONE)\n" - "+ if (instance->irq == SCSI_IRQ_NONE)\n" - " \tprintk (KERN_INFO \"s disabled\");\n" - " else\n" - " \tprintk (KERN_INFO \" %d\", instance->irq);\n" - "@@ -277,7 +277,7 @@\n" - " \n" - " int macscsi_release (struct Scsi_Host *shpnt)\n" - " {\n" - "-\tif (shpnt->irq != IRQ_NONE)\n" - "+\tif (shpnt->irq != SCSI_IRQ_NONE)\n" - " \t\tfree_irq (shpnt->irq, NCR5380_intr);\n" - " \n" - " \treturn 0;\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/pas16.c.old\t2003-09-02 20:29:32.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/pas16.c\t2003-09-02 20:30:00.000000000 +0200\n" - "@@ -99,11 +99,11 @@\n" - " * interrupts. Ie, for a board at the default 0x388 base port,\n" - " * boot: linux pas16=0x388,255\n" - " *\n" - "- * IRQ_NONE (255) should be specified for no interrupt,\n" - "+ * SCSI_IRQ_NONE (255) should be specified for no interrupt,\n" - " * IRQ_AUTO (254) to autoprobe for an IRQ line if overridden\n" - " * on the command line.\n" - " *\n" - "- * (IRQ_AUTO == 254, IRQ_NONE == 255 in NCR5380.h)\n" - "+ * (IRQ_AUTO == 254, SCSI_IRQ_NONE == 255 in NCR5380.h)\n" - " */\n" - " \n" - " #include <linux/module.h>\n" - "@@ -404,13 +404,13 @@\n" - " \t\telse\n" - " \t\t\tinstance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);\n" - " \n" - "-\t\tif (instance->irq != IRQ_NONE)\n" - "+\t\tif (instance->irq != SCSI_IRQ_NONE)\n" - " \t\t\tif (request_irq(instance->irq, do_pas16_intr, SA_INTERRUPT, \"pas16\", NULL)) {\n" - " \t\t\t\tprintk(KERN_WARNING \"scsi%d : IRQ%d not free, interrupts disabled\\n\", instance->host_no, instance->irq);\n" - "-\t\t\t\tinstance->irq = IRQ_NONE;\n" - "+\t\t\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " \t\t\t}\n" - " \n" - "-\t\tif (instance->irq == IRQ_NONE) {\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE) {\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : interrupts not enabled. for better interactive performance,\\n\", instance->host_no);\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : please jumper the board for a free IRQ.\\n\", instance->host_no);\n" - " \t\t\t/* Disable 5380 interrupts, leave drive params the same */\n" - "@@ -420,7 +420,7 @@\n" - " \n" - " \t\tprintk(KERN_INFO \"scsi%d : at 0x%04x\", instance->host_no, (int)\n" - " \t\t instance->io_port);\n" - "-\t\tif (instance->irq == IRQ_NONE)\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\t\tprintk(\" interrupts disabled\");\n" - " \t\telse\n" - " \t\t\tprintk(\" irq %d\", instance->irq);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi.c.old\t2003-09-02 20:30:00.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi.c\t2003-09-02 20:30:16.000000000 +0200\n" - "@@ -267,7 +267,7 @@\n" - " #ifndef REAL_DMA\n" - " \t\tprintk(\"scsi%d: IRQ%d not free, interrupts disabled\\n\",\n" - " \t\t instance->host_no, instance->irq);\n" - "-\t\tinstance->irq = IRQ_NONE;\n" - "+\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " #else\n" - " \t\tprintk(\"scsi%d: IRQ%d not free, bailing out\\n\",\n" - " \t\t instance->host_no, instance->irq);\n" - "@@ -276,7 +276,7 @@\n" - " \t}\n" - " \t\n" - " \tprintk(\"scsi%d: Sun3 5380 at port %lX irq\", instance->host_no, instance->io_port);\n" - "-\tif (instance->irq == IRQ_NONE)\n" - "+\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\tprintk (\"s disabled\");\n" - " \telse\n" - " \t\tprintk (\" %d\", instance->irq);\n" - "@@ -305,7 +305,7 @@\n" - " #ifdef MODULE\n" - " int sun3scsi_release (struct Scsi_Host *shpnt)\n" - " {\n" - "-\tif (shpnt->irq != IRQ_NONE)\n" - "+\tif (shpnt->irq != SCSI_IRQ_NONE)\n" - " \t\tfree_irq (shpnt->irq, NULL);\n" - " \n" - " \tiounmap((void *)sun3_scsi_regp);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi_vme.c.old\t2003-09-02 20:30:16.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/sun3_scsi_vme.c\t2003-09-02 20:30:37.000000000 +0200\n" - "@@ -236,7 +236,7 @@\n" - " #ifndef REAL_DMA\n" - " \t\tprintk(\"scsi%d: IRQ%d not free, interrupts disabled\\n\",\n" - " \t\t instance->host_no, instance->irq);\n" - "-\t\tinstance->irq = IRQ_NONE;\n" - "+\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " #else\n" - " \t\tprintk(\"scsi%d: IRQ%d not free, bailing out\\n\",\n" - " \t\t instance->host_no, instance->irq);\n" - "@@ -245,7 +245,7 @@\n" - " \t}\n" - " \n" - " \tprintk(\"scsi%d: Sun3 5380 VME at port %lX irq\", instance->host_no, instance->io_port);\n" - "-\tif (instance->irq == IRQ_NONE)\n" - "+\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\tprintk (\"s disabled\");\n" - " \telse\n" - " \t\tprintk (\" %d\", instance->irq);\n" - "@@ -281,7 +281,7 @@\n" - " #ifdef MODULE\n" - " int sun3scsi_release (struct Scsi_Host *shpnt)\n" - " {\n" - "-\tif (shpnt->irq != IRQ_NONE)\n" - "+\tif (shpnt->irq != SCSI_IRQ_NONE)\n" - " \t\tfree_irq (shpnt->irq, NULL);\n" - " \n" - " \tiounmap(sun3_scsi_regp);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/t128.c.old\t2003-09-02 20:30:37.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/t128.c\t2003-09-02 20:30:59.000000000 +0200\n" - "@@ -237,20 +237,20 @@\n" - " \t\telse\n" - " \t\t\tinstance->irq = NCR5380_probe_irq(instance, T128_IRQS);\n" - " \n" - "-\t\tif (instance->irq != IRQ_NONE)\n" - "+\t\tif (instance->irq != SCSI_IRQ_NONE)\n" - " \t\t\tif (request_irq(instance->irq, do_t128_intr, SA_INTERRUPT, \"t128\", NULL)) \n" - " \t\t\t{\n" - " \t\t\t\tprintk(KERN_WARNING \"scsi%d : IRQ%d not free, interrupts disabled\\n\", instance->host_no, instance->irq);\n" - "-\t\t\t\tinstance->irq = IRQ_NONE;\n" - "+\t\t\t\tinstance->irq = SCSI_IRQ_NONE;\n" - " \t\t\t}\n" - " \n" - "-\t\tif (instance->irq == IRQ_NONE) {\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE) {\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : interrupts not enabled. for better interactive performance,\\n\", instance->host_no);\n" - " \t\t\tprintk(KERN_INFO \"scsi%d : please jumper the board for a free IRQ.\\n\", instance->host_no);\n" - " \t\t}\n" - " \n" - " \t\tprintk(KERN_INFO \"scsi%d : at 0x%08lx\", instance->host_no,instance->base);\n" - "-\t\tif (instance->irq == IRQ_NONE)\n" - "+\t\tif (instance->irq == SCSI_IRQ_NONE)\n" - " \t\t\tprintk(\" interrupts disabled\");\n" - " \t\telse\n" - " \t\t\tprintk(\" irq %d\", instance->irq);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/tmscsim.c.old\t2003-09-02 20:30:59.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/tmscsim.c\t2003-09-02 20:31:05.000000000 +0200\n" - "@@ -3047,7 +3047,7 @@\n" - " /* TO DO: We should check for outstanding commands first. */\n" - " dc390_shutdown (host);\n" - " \n" - "- if (host->irq != IRQ_NONE)\n" - "+ if (host->irq != SCSI_IRQ_NONE)\n" - " {\n" - " \tDEBUG0(printk(KERN_INFO \"DC390: Free IRQ %i\\n\",host->irq);)\n" - " \tfree_irq (host->irq, pACB);\n" - "--- linux-2.4.23-pre2-full/drivers/scsi/tmscsim.h.old\t2003-09-02 20:31:05.000000000 +0200\n" - "+++ linux-2.4.23-pre2-full/drivers/scsi/tmscsim.h\t2003-09-02 20:31:21.000000000 +0200\n" - "@@ -11,7 +11,7 @@\n" - " #include <linux/types.h>\n" - " #include <linux/config.h>\n" - " \n" - "-#define IRQ_NONE 255\n" - "+#define SCSI_IRQ_NONE 255\n" - " \n" - " #define MAX_ADAPTER_NUM \t4\n" " #define MAX_SG_LIST_BUF \t16\t/* Not used */" -9e34c7a8094f68079ef8205007d191add92d3043cdc8656439b4ee2e35228443 +d86f90e639e9df9ec7173e2c9362ee1b2ad6015c8e960953e68d733690eba6cb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.