diff for duplicates of <20160323101013.921762099@telegraphics.com.au> diff --git a/a/1.txt b/N1/1.txt index ddf94a9..f7b18c2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,194 +1,3 @@ -Signed-off-by: Finn Thain <fthain@telegraphics.com.au> -Reviewed-by: Hannes Reinecke <hare@suse.com> -Tested-by: Michael Schmitz <schmitzmic@gmail.com> -Tested-by: Ondrej Zary <linux@rainbow-software.org> - ---- - drivers/scsi/NCR5380.c | 12 +----------- - drivers/scsi/NCR5380.h | 4 ---- - drivers/scsi/arm/oak.c | 2 -- - drivers/scsi/dmx3191d.c | 2 -- - drivers/scsi/dtc.c | 12 +++--------- - drivers/scsi/g_NCR5380.c | 2 -- - drivers/scsi/pas16.c | 1 - - drivers/scsi/t128.c | 1 - - 8 files changed, 4 insertions(+), 32 deletions(-) - -Index: linux/drivers/scsi/NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.c 2016-03-23 21:09:59.000000000 +1100 -+++ linux/drivers/scsi/NCR5380.c 2016-03-23 21:10:00.000000000 +1100 -@@ -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_Hos - 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 - } - } - --#ifndef DONT_USE_INTR -- - /** - * NCR5380_intr - generic NCR5380 irq handler - * @irq: interrupt number -@@ -951,7 +943,7 @@ static void NCR5380_dma_complete(struct - * 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, - return IRQ_RETVAL(handled); - } - --#endif -- - /* - * Function : int NCR5380_select(struct Scsi_Host *instance, - * struct scsi_cmnd *cmd) -Index: linux/drivers/scsi/NCR5380.h -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.h 2016-03-23 21:09:53.000000000 +1100 -+++ linux/drivers/scsi/NCR5380.h 2016-03-23 21:10:00.000000000 +1100 -@@ -280,16 +280,12 @@ static void NCR5380_print(struct Scsi_Ho - #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); -Index: linux/drivers/scsi/arm/oak.c -=================================================================== ---- linux.orig/drivers/scsi/arm/oak.c 2016-03-23 21:09:47.000000000 +1100 -+++ linux/drivers/scsi/arm/oak.c 2016-03-23 21:10:00.000000000 +1100 -@@ -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) \ -Index: linux/drivers/scsi/dmx3191d.c -=================================================================== ---- linux.orig/drivers/scsi/dmx3191d.c 2016-03-23 21:09:57.000000000 +1100 -+++ linux/drivers/scsi/dmx3191d.c 2016-03-23 21:10:00.000000000 +1100 -@@ -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) - -Index: linux/drivers/scsi/dtc.c -=================================================================== ---- linux.orig/drivers/scsi/dtc.c 2016-03-23 21:09:47.000000000 +1100 -+++ linux/drivers/scsi/dtc.c 2016-03-23 21:10:00.000000000 +1100 -@@ -1,5 +1,3 @@ --#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); - -Index: linux/drivers/scsi/g_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/g_NCR5380.c 2016-03-23 21:09:47.000000000 +1100 -+++ linux/drivers/scsi/g_NCR5380.c 2016-03-23 21:10:00.000000000 +1100 -@@ -56,8 +56,6 @@ - * - */ - --#define AUTOPROBE_IRQ -- - #include <asm/io.h> - #include <linux/blkdev.h> - #include <linux/module.h> -Index: linux/drivers/scsi/pas16.c -=================================================================== ---- linux.orig/drivers/scsi/pas16.c 2016-03-23 21:09:47.000000000 +1100 -+++ linux/drivers/scsi/pas16.c 2016-03-23 21:10:00.000000000 +1100 -@@ -75,7 +75,6 @@ - - #include <scsi/scsi_host.h> - #include "pas16.h" --#define AUTOPROBE_IRQ - #include "NCR5380.h" - - -Index: linux/drivers/scsi/t128.c -=================================================================== ---- linux.orig/drivers/scsi/t128.c 2016-03-23 21:09:47.000000000 +1100 -+++ linux/drivers/scsi/t128.c 2016-03-23 21:10:00.000000000 +1100 -@@ -74,7 +74,6 @@ - - #include <scsi/scsi_host.h> - #include "t128.h" --#define AUTOPROBE_IRQ - #include "NCR5380.h" - - static struct override { +An embedded and charset-unspecified text was scrubbed... +Name: ncr5380-remove-DONT_USE_INTR-and-AUTOPROBE_IRQ-macros +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160323/15d611aa/attachment.ksh> diff --git a/a/content_digest b/N1/content_digest index 2ca4c07..ee5eb4b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,213 +1,12 @@ "ref\020160323101009.341929635@telegraphics.com.au\0" - "From\0Finn Thain <fthain@telegraphics.com.au>\0" + "From\0fthain@telegraphics.com.au (Finn Thain)\0" "Subject\0[PATCH v4 18/23] ncr5380: Remove DONT_USE_INTR and AUTOPROBE_IRQ macros\0" "Date\0Wed, 23 Mar 2016 21:10:27 +1100\0" - "To\0James E.J. Bottomley <James.Bottomley@hansenpartnership.com>" - Martin K. Petersen <martin.petersen@oracle.com> - Michael Schmitz <schmitzmic@gmail.com> - linux-m68k@vger.kernel.org - linux-scsi@vger.kernel.org - linux-kernel@vger.kernel.org - Russell King <linux@arm.linux.org.uk> - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0Ondrej Zary <linux@rainbow-software.org>" - " Sam Creasey <sammy@sammy.net>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0ncr5380-remove-DONT_USE_INTR-and-AUTOPROBE_IRQ-macros\0" "b\0" - "Signed-off-by: Finn Thain <fthain@telegraphics.com.au>\n" - "Reviewed-by: Hannes Reinecke <hare@suse.com>\n" - "Tested-by: Michael Schmitz <schmitzmic@gmail.com>\n" - "Tested-by: Ondrej Zary <linux@rainbow-software.org>\n" - "\n" - "---\n" - " drivers/scsi/NCR5380.c | 12 +-----------\n" - " drivers/scsi/NCR5380.h | 4 ----\n" - " drivers/scsi/arm/oak.c | 2 --\n" - " drivers/scsi/dmx3191d.c | 2 --\n" - " drivers/scsi/dtc.c | 12 +++---------\n" - " drivers/scsi/g_NCR5380.c | 2 --\n" - " drivers/scsi/pas16.c | 1 -\n" - " drivers/scsi/t128.c | 1 -\n" - " 8 files changed, 4 insertions(+), 32 deletions(-)\n" - "\n" - "Index: linux/drivers/scsi/NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.c\t2016-03-23 21:09:59.000000000 +1100\n" - "+++ linux/drivers/scsi/NCR5380.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -106,9 +106,6 @@\n" - " * DIFFERENTIAL - if defined, NCR53c81 chips will use external differential\n" - " * transceivers.\n" - " *\n" - "- * DONT_USE_INTR - if defined, never use interrupts, even if we probe or\n" - "- * override-configure an IRQ.\n" - "- *\n" - " * PSEUDO_DMA - if defined, PSEUDO DMA is used during the data transfer phases.\n" - " *\n" - " * REAL_DMA - if defined, REAL DMA is used during the data transfer phases.\n" - "@@ -464,9 +461,6 @@ static void prepare_info(struct Scsi_Hos\n" - " \t hostdata->flags & FLAG_DMA_FIXUP ? \"DMA_FIXUP \" : \"\",\n" - " \t hostdata->flags & FLAG_NO_PSEUDO_DMA ? \"NO_PSEUDO_DMA \" : \"\",\n" - " \t hostdata->flags & FLAG_TOSHIBA_DELAY ? \"TOSHIBA_DELAY \" : \"\",\n" - "-#ifdef AUTOPROBE_IRQ\n" - "-\t \"AUTOPROBE_IRQ \"\n" - "-#endif\n" - " #ifdef DIFFERENTIAL\n" - " \t \"DIFFERENTIAL \"\n" - " #endif\n" - "@@ -915,8 +909,6 @@ static void NCR5380_dma_complete(struct\n" - " \t}\n" - " }\n" - " \n" - "-#ifndef DONT_USE_INTR\n" - "-\n" - " /**\n" - " * NCR5380_intr - generic NCR5380 irq handler\n" - " * @irq: interrupt number\n" - "@@ -951,7 +943,7 @@ static void NCR5380_dma_complete(struct\n" - " * the Busy Monitor interrupt is enabled together with DMA Mode.\n" - " */\n" - " \n" - "-static irqreturn_t NCR5380_intr(int irq, void *dev_id)\n" - "+static irqreturn_t __maybe_unused NCR5380_intr(int irq, void *dev_id)\n" - " {\n" - " \tstruct Scsi_Host *instance = dev_id;\n" - " \tstruct NCR5380_hostdata *hostdata = shost_priv(instance);\n" - "@@ -1020,8 +1012,6 @@ static irqreturn_t NCR5380_intr(int irq,\n" - " \treturn IRQ_RETVAL(handled);\n" - " }\n" - " \n" - "-#endif\n" - "-\n" - " /*\n" - " * Function : int NCR5380_select(struct Scsi_Host *instance,\n" - " * struct scsi_cmnd *cmd)\n" - "Index: linux/drivers/scsi/NCR5380.h\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.h\t2016-03-23 21:09:53.000000000 +1100\n" - "+++ linux/drivers/scsi/NCR5380.h\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -280,16 +280,12 @@ static void NCR5380_print(struct Scsi_Ho\n" - " #define NCR5380_dprint_phase(flg, arg) do {} while (0)\n" - " #endif\n" - " \n" - "-#if defined(AUTOPROBE_IRQ)\n" - " static int NCR5380_probe_irq(struct Scsi_Host *instance, int possible);\n" - "-#endif\n" - " static int NCR5380_init(struct Scsi_Host *instance, int flags);\n" - " static int NCR5380_maybe_reset_bus(struct Scsi_Host *);\n" - " static void NCR5380_exit(struct Scsi_Host *instance);\n" - " static void NCR5380_information_transfer(struct Scsi_Host *instance);\n" - "-#ifndef DONT_USE_INTR\n" - " static irqreturn_t NCR5380_intr(int irq, void *dev_id);\n" - "-#endif\n" - " static void NCR5380_main(struct work_struct *work);\n" - " static const char *NCR5380_info(struct Scsi_Host *instance);\n" - " static void NCR5380_reselect(struct Scsi_Host *instance);\n" - "Index: linux/drivers/scsi/arm/oak.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/arm/oak.c\t2016-03-23 21:09:47.000000000 +1100\n" - "+++ linux/drivers/scsi/arm/oak.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -14,8 +14,6 @@\n" - " \n" - " #include <scsi/scsi_host.h>\n" - " \n" - "-#define DONT_USE_INTR\n" - "-\n" - " #define priv(host)\t\t\t((struct NCR5380_hostdata *)(host)->hostdata)\n" - " \n" - " #define NCR5380_read(reg) \\\n" - "Index: linux/drivers/scsi/dmx3191d.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/dmx3191d.c\t2016-03-23 21:09:57.000000000 +1100\n" - "+++ linux/drivers/scsi/dmx3191d.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -34,8 +34,6 @@\n" - " * Definitions for the generic 5380 driver.\n" - " */\n" - " \n" - "-#define DONT_USE_INTR\n" - "-\n" - " #define NCR5380_read(reg)\t\tinb(instance->io_port + reg)\n" - " #define NCR5380_write(reg, value)\toutb(value, instance->io_port + reg)\n" - " \n" - "Index: linux/drivers/scsi/dtc.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/dtc.c\t2016-03-23 21:09:47.000000000 +1100\n" - "+++ linux/drivers/scsi/dtc.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -1,5 +1,3 @@\n" - "-#define DONT_USE_INTR\n" - "-\n" - " /*\n" - " * DTC 3180/3280 driver, by\n" - " *\tRay Van Tassle\trayvt@comm.mot.com\n" - "@@ -53,7 +51,6 @@\n" - " #include <scsi/scsi_host.h>\n" - " \n" - " #include \"dtc.h\"\n" - "-#define AUTOPROBE_IRQ\n" - " #include \"NCR5380.h\"\n" - " \n" - " /*\n" - "@@ -243,9 +240,10 @@ found:\n" - " \t\tif (instance->irq == 255)\n" - " \t\t\tinstance->irq = NO_IRQ;\n" - " \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 finger it out. */\n" - "+\t\tinstance->irq = NO_IRQ;\n" - "+\n" - " \t\tif (instance->irq != NO_IRQ)\n" - " \t\t\tif (request_irq(instance->irq, dtc_intr, 0,\n" - " \t\t\t\t\t\"dtc\", instance)) {\n" - "@@ -257,11 +255,7 @@ found:\n" - " \t\t\tprintk(KERN_WARNING \"scsi%d : interrupts not enabled. for better interactive performance,\\n\", instance->host_no);\n" - " \t\t\tprintk(KERN_WARNING \"scsi%d : please jumper the board for a free IRQ.\\n\", instance->host_no);\n" - " \t\t}\n" - "-#else\n" - "-\t\tif (instance->irq != NO_IRQ)\n" - "-\t\t\tprintk(KERN_WARNING \"scsi%d : interrupts not used. Might as well not jumper it.\\n\", instance->host_no);\n" - "-\t\tinstance->irq = NO_IRQ;\n" - "-#endif\n" - "+\n" - " \t\tdprintk(NDEBUG_INIT, \"scsi%d : irq = %d\\n\",\n" - " \t\t instance->host_no, instance->irq);\n" - " \n" - "Index: linux/drivers/scsi/g_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/g_NCR5380.c\t2016-03-23 21:09:47.000000000 +1100\n" - "+++ linux/drivers/scsi/g_NCR5380.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -56,8 +56,6 @@\n" - " * \n" - " */\n" - " \n" - "-#define AUTOPROBE_IRQ\n" - "-\n" - " #include <asm/io.h>\n" - " #include <linux/blkdev.h>\n" - " #include <linux/module.h>\n" - "Index: linux/drivers/scsi/pas16.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/pas16.c\t2016-03-23 21:09:47.000000000 +1100\n" - "+++ linux/drivers/scsi/pas16.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -75,7 +75,6 @@\n" - " \n" - " #include <scsi/scsi_host.h>\n" - " #include \"pas16.h\"\n" - "-#define AUTOPROBE_IRQ\n" - " #include \"NCR5380.h\"\n" - " \n" - " \n" - "Index: linux/drivers/scsi/t128.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/t128.c\t2016-03-23 21:09:47.000000000 +1100\n" - "+++ linux/drivers/scsi/t128.c\t2016-03-23 21:10:00.000000000 +1100\n" - "@@ -74,7 +74,6 @@\n" - " \n" - " #include <scsi/scsi_host.h>\n" - " #include \"t128.h\"\n" - "-#define AUTOPROBE_IRQ\n" - " #include \"NCR5380.h\"\n" - " \n" - static struct override { + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: ncr5380-remove-DONT_USE_INTR-and-AUTOPROBE_IRQ-macros\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160323/15d611aa/attachment.ksh> -b45dc4b804d91d0d28e85abdb816815a13e99e1c1ba1f2dafdfa07b958a63a42 +89d314b830423cce4bf7db46ead10a9220fcff8c4d9bd22fa490b966313a6784
diff --git a/a/content_digest b/N2/content_digest index 2ca4c07..cf359d1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,9 +5,9 @@ "To\0James E.J. Bottomley <James.Bottomley@hansenpartnership.com>" Martin K. Petersen <martin.petersen@oracle.com> Michael Schmitz <schmitzmic@gmail.com> - linux-m68k@vger.kernel.org - linux-scsi@vger.kernel.org - linux-kernel@vger.kernel.org + <linux-m68k@vger.kernel.org> + <linux-scsi@vger.kernel.org> + <linux-kernel@vger.kernel.org> Russell King <linux@arm.linux.org.uk> " linux-arm-kernel@lists.infradead.org\0" "Cc\0Ondrej Zary <linux@rainbow-software.org>" @@ -210,4 +210,4 @@ " \n" static struct override { -b45dc4b804d91d0d28e85abdb816815a13e99e1c1ba1f2dafdfa07b958a63a42 +0f997ba6530347d3ed93a86b8300f07ec67e8fc53f7d55101a2c594eb2b8741e
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.