diff for duplicates of <20141002065629.216175491@telegraphics.com.au> diff --git a/a/1.txt b/N1/1.txt index cc1e2bb..beda855 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,216 +1,3 @@ -Some macros are never evaluated (i.e. FOO, USLEEP, SCSI2 and USE_WRAPPER; and -in some drivers, NCR5380_intr and NCR5380_proc_info). DRIVER_SETUP serves no -purpose anymore. Remove these macro definitions. - -Signed-off-by: Finn Thain <fthain@telegraphics.com.au> - ---- - drivers/scsi/NCR5380.c | 2 +- - drivers/scsi/arm/oak.c | 1 - - drivers/scsi/atari_scsi.h | 1 - - drivers/scsi/g_NCR5380.c | 5 ----- - drivers/scsi/g_NCR5380.h | 1 - - drivers/scsi/mac_scsi.c | 3 --- - drivers/scsi/pas16.c | 5 ----- - drivers/scsi/sun3_scsi.c | 15 --------------- - drivers/scsi/sun3_scsi.h | 1 - - drivers/scsi/t128.c | 5 ----- - 10 files changed, 1 insertion(+), 38 deletions(-) - -Index: linux/drivers/scsi/mac_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/mac_scsi.c 2014-10-02 16:55:50.000000000 +1000 -+++ linux/drivers/scsi/mac_scsi.c 2014-10-02 16:55:52.000000000 +1000 -@@ -55,7 +55,6 @@ - #include "NCR5380.h" - - #define RESET_BOOT --#define DRIVER_SETUP - - extern void via_scsi_clear(void); - -@@ -113,7 +112,6 @@ static __inline__ void macscsi_write(str - */ - - static int __init mac_scsi_setup(char *str) { --#ifdef DRIVER_SETUP - int ints[7]; - - (void)get_options( str, ARRAY_SIZE(ints), ints); -@@ -166,7 +164,6 @@ static int __init mac_scsi_setup(char *s - } - #endif /* SUPPORT_TAGS */ - --#endif /* DRIVER_SETUP */ - return 1; - } - -Index: linux/drivers/scsi/sun3_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/sun3_scsi.c 2014-10-02 16:55:50.000000000 +1000 -+++ linux/drivers/scsi/sun3_scsi.c 2014-10-02 16:55:52.000000000 +1000 -@@ -43,10 +43,6 @@ - * Options : - * - * PARITY - enable parity checking. Not supported. -- * -- * SCSI2 - enable support for SCSI-II tagged queueing. Untested. -- * -- * USLEEP - enable support for devices that don't disconnect. Untested. - */ - - #define AUTOSENSE -@@ -79,18 +75,7 @@ - - extern int sun3_map_test(unsigned long, char *); - --#define USE_WRAPPER - /*#define RESET_BOOT */ --#define DRIVER_SETUP -- --/* -- * BUG can be used to trigger a strange code-size related hang on 2.1 kernels -- */ --#ifdef BUG --#undef RESET_BOOT --#undef DRIVER_SETUP --#endif -- - /* #define SUPPORT_TAGS */ - - #ifdef SUN3_SCSI_VME -Index: linux/drivers/scsi/NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.c 2014-10-02 16:55:28.000000000 +1000 -+++ linux/drivers/scsi/NCR5380.c 2014-10-02 16:55:52.000000000 +1000 -@@ -649,7 +649,7 @@ NCR5380_print_options(struct Scsi_Host * - " UNSAFE " - #endif - ); -- printk(" USLEEP, USLEEP_POLL=%d USLEEP_SLEEP=%d", USLEEP_POLL, USLEEP_SLEEP); -+ printk(" USLEEP_POLL=%d USLEEP_SLEEP=%d", USLEEP_POLL, USLEEP_SLEEP); - printk(" generic release=%d", NCR5380_PUBLIC_RELEASE); - if (((struct NCR5380_hostdata *) instance->hostdata)->flags & FLAG_NCR53C400) { - printk(" ncr53c400 release=%d", NCR53C400_PUBLIC_RELEASE); -Index: linux/drivers/scsi/pas16.c -=================================================================== ---- linux.orig/drivers/scsi/pas16.c 2014-10-02 16:55:51.000000000 +1000 -+++ linux/drivers/scsi/pas16.c 2014-10-02 16:55:52.000000000 +1000 -@@ -1,6 +1,5 @@ - #define AUTOSENSE - #define PSEUDO_DMA --#define FOO - #define UNSAFE /* Not unsafe for PAS16 -- use it */ - #define PDEBUG 0 - -@@ -52,8 +51,6 @@ - * increase compared to polled I/O. - * - * PARITY - enable parity checking. Not supported. -- * -- * SCSI2 - enable support for SCSI-II tagged queueing. Untested. - * - * UNSAFE - leave interrupts enabled during pseudo-DMA transfers. This - * parameter comes from the NCR5380 code. It is NOT unsafe with -@@ -63,8 +60,6 @@ - * want to use UNSAFE you can try defining LIMIT_TRANSFERSIZE or - * twiddle with the transfer size in the high level code. - * -- * USLEEP - enable support for devices that don't disconnect. Untested. -- * - * The card is detected and initialized in one of several ways : - * 1. Autoprobe (default) - There are many different models of - * the Pro Audio Spectrum/Studio 16, and I only have one of -Index: linux/drivers/scsi/g_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/g_NCR5380.c 2014-10-02 16:55:28.000000000 +1000 -+++ linux/drivers/scsi/g_NCR5380.c 2014-10-02 16:55:52.000000000 +1000 -@@ -44,10 +44,6 @@ - * - * PARITY - enable parity checking. Not supported. - * -- * SCSI2 - enable support for SCSI-II tagged queueing. Untested. -- * -- * USLEEP - enable support for devices that don't disconnect. Untested. -- * - * The card is detected and initialized in one of several ways : - * 1. With command line overrides - NCR5380=port,irq may be - * used on the LILO command line to override the defaults. -@@ -79,7 +75,6 @@ - */ - - /* settings for DTC3181E card with only Mustek scanner attached */ --#define USLEEP - #define USLEEP_POLL 1 - #define USLEEP_SLEEP 20 - #define USLEEP_WAITLONG 500 -Index: linux/drivers/scsi/arm/oak.c -=================================================================== ---- linux.orig/drivers/scsi/arm/oak.c 2014-10-02 16:55:28.000000000 +1000 -+++ linux/drivers/scsi/arm/oak.c 2014-10-02 16:55:52.000000000 +1000 -@@ -29,7 +29,6 @@ - - #define NCR5380_read(reg) readb(_base + ((reg) << 2)) - #define NCR5380_write(reg, value) writeb(value, _base + ((reg) << 2)) --#define NCR5380_intr oakscsi_intr - #define NCR5380_queue_command oakscsi_queue_command - #define NCR5380_show_info oakscsi_show_info - #define NCR5380_write_info oakscsi_write_info -Index: linux/drivers/scsi/g_NCR5380.h -=================================================================== ---- linux.orig/drivers/scsi/g_NCR5380.h 2014-10-02 16:55:28.000000000 +1000 -+++ linux/drivers/scsi/g_NCR5380.h 2014-10-02 16:55:52.000000000 +1000 -@@ -118,7 +118,6 @@ static const char* generic_NCR5380_info( - #define NCR5380_bus_reset generic_NCR5380_bus_reset - #define NCR5380_pread generic_NCR5380_pread - #define NCR5380_pwrite generic_NCR5380_pwrite --#define NCR5380_proc_info notyet_generic_proc_info - - #define BOARD_NCR5380 0 - #define BOARD_NCR53C400 1 -Index: linux/drivers/scsi/t128.c -=================================================================== ---- linux.orig/drivers/scsi/t128.c 2014-10-02 16:55:51.000000000 +1000 -+++ linux/drivers/scsi/t128.c 2014-10-02 16:55:52.000000000 +1000 -@@ -47,17 +47,12 @@ - * increase compared to polled I/O. - * - * PARITY - enable parity checking. Not supported. -- * -- * SCSI2 - enable support for SCSI-II tagged queueing. Untested. -- * - * - * UNSAFE - leave interrupts enabled during pseudo-DMA transfers. You - * only really want to use this if you're having a problem with - * dropped characters during high speed communications, and even - * then, you're going to be better off twiddling with transfersize. - * -- * USLEEP - enable support for devices that don't disconnect. Untested. -- * - * The card is detected and initialized in one of several ways : - * 1. Autoprobe (default) - since the board is memory mapped, - * a BIOS signature is scanned for to locate the registers. -Index: linux/drivers/scsi/sun3_scsi.h -=================================================================== ---- linux.orig/drivers/scsi/sun3_scsi.h 2014-10-02 16:55:50.000000000 +1000 -+++ linux/drivers/scsi/sun3_scsi.h 2014-10-02 16:55:52.000000000 +1000 -@@ -89,7 +89,6 @@ static int sun3scsi_release (struct Scsi - #define NCR5380_read(reg) sun3scsi_read(reg) - #define NCR5380_write(reg, value) sun3scsi_write(reg, value) - --#define NCR5380_intr sun3scsi_intr - #define NCR5380_queue_command sun3scsi_queue_command - #define NCR5380_bus_reset sun3scsi_bus_reset - #define NCR5380_abort sun3scsi_abort -Index: linux/drivers/scsi/atari_scsi.h -=================================================================== ---- linux.orig/drivers/scsi/atari_scsi.h 2014-10-02 16:55:28.000000000 +1000 -+++ linux/drivers/scsi/atari_scsi.h 2014-10-02 16:55:52.000000000 +1000 -@@ -44,7 +44,6 @@ - #define NCR5380_read(reg) atari_scsi_reg_read( reg ) - #define NCR5380_write(reg, value) atari_scsi_reg_write( reg, value ) - --#define NCR5380_intr atari_scsi_intr - #define NCR5380_queue_command atari_scsi_queue_command - #define NCR5380_abort atari_scsi_abort - #define NCR5380_show_info atari_scsi_show_info +An embedded and charset-unspecified text was scrubbed... +Name: ncr5380-remove-unused-macros +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141002/52ba4ecb/attachment.ksh> diff --git a/a/content_digest b/N1/content_digest index efb6e33..207a2a7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,232 +1,12 @@ "ref\020141002065628.256592712@telegraphics.com.au\0" - "From\0Finn Thain <fthain@telegraphics.com.au>\0" + "From\0fthain@telegraphics.com.au (Finn Thain)\0" "Subject\0[PATCH 04/29] ncr5380: Remove unused macros\0" "Date\0Thu, 02 Oct 2014 16:56:32 +1000\0" - "To\0James E.J. Bottomley <JBottomley@parallels.com>\0" - "Cc\0Michael Schmitz <schmitzmic@gmail.com>" - Sam Creasey <sammy@sammy.net> - linux-scsi@vger.kernel.org - linux-m68k@vger.kernel.org - Russell King <linux@arm.linux.org.uk> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0ncr5380-remove-unused-macros\0" "b\0" - "Some macros are never evaluated (i.e. FOO, USLEEP, SCSI2 and USE_WRAPPER; and \n" - "in some drivers, NCR5380_intr and NCR5380_proc_info). DRIVER_SETUP serves no\n" - "purpose anymore. Remove these macro definitions.\n" - "\n" - "Signed-off-by: Finn Thain <fthain@telegraphics.com.au>\n" - "\n" - "---\n" - " drivers/scsi/NCR5380.c | 2 +-\n" - " drivers/scsi/arm/oak.c | 1 -\n" - " drivers/scsi/atari_scsi.h | 1 -\n" - " drivers/scsi/g_NCR5380.c | 5 -----\n" - " drivers/scsi/g_NCR5380.h | 1 -\n" - " drivers/scsi/mac_scsi.c | 3 ---\n" - " drivers/scsi/pas16.c | 5 -----\n" - " drivers/scsi/sun3_scsi.c | 15 ---------------\n" - " drivers/scsi/sun3_scsi.h | 1 -\n" - " drivers/scsi/t128.c | 5 -----\n" - " 10 files changed, 1 insertion(+), 38 deletions(-)\n" - "\n" - "Index: linux/drivers/scsi/mac_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/mac_scsi.c\t2014-10-02 16:55:50.000000000 +1000\n" - "+++ linux/drivers/scsi/mac_scsi.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -55,7 +55,6 @@\n" - " #include \"NCR5380.h\"\n" - " \n" - " #define RESET_BOOT\n" - "-#define DRIVER_SETUP\n" - " \n" - " extern void via_scsi_clear(void);\n" - " \n" - "@@ -113,7 +112,6 @@ static __inline__ void macscsi_write(str\n" - " */\n" - " \n" - " static int __init mac_scsi_setup(char *str) {\n" - "-#ifdef DRIVER_SETUP\t\n" - " \tint ints[7];\n" - " \t\n" - " \t(void)get_options( str, ARRAY_SIZE(ints), ints);\n" - "@@ -166,7 +164,6 @@ static int __init mac_scsi_setup(char *s\n" - " \t}\n" - " #endif /* SUPPORT_TAGS */\n" - " \t\n" - "-#endif /* DRIVER_SETUP */\n" - " \treturn 1;\n" - " }\n" - " \n" - "Index: linux/drivers/scsi/sun3_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/sun3_scsi.c\t2014-10-02 16:55:50.000000000 +1000\n" - "+++ linux/drivers/scsi/sun3_scsi.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -43,10 +43,6 @@\n" - " * Options :\n" - " *\n" - " * PARITY - enable parity checking. Not supported.\n" - "- *\n" - "- * SCSI2 - enable support for SCSI-II tagged queueing. Untested.\n" - "- *\n" - "- * USLEEP - enable support for devices that don't disconnect. Untested.\n" - " */\n" - " \n" - " #define AUTOSENSE\n" - "@@ -79,18 +75,7 @@\n" - " \n" - " extern int sun3_map_test(unsigned long, char *);\n" - " \n" - "-#define USE_WRAPPER\n" - " /*#define RESET_BOOT */\n" - "-#define DRIVER_SETUP\n" - "-\n" - "-/*\n" - "- * BUG can be used to trigger a strange code-size related hang on 2.1 kernels\n" - "- */\n" - "-#ifdef BUG\n" - "-#undef RESET_BOOT\n" - "-#undef DRIVER_SETUP\n" - "-#endif\n" - "-\n" - " /* #define SUPPORT_TAGS */\n" - " \n" - " #ifdef SUN3_SCSI_VME\n" - "Index: linux/drivers/scsi/NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.c\t2014-10-02 16:55:28.000000000 +1000\n" - "+++ linux/drivers/scsi/NCR5380.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -649,7 +649,7 @@ NCR5380_print_options(struct Scsi_Host *\n" - " \t \" UNSAFE \"\n" - " #endif\n" - " \t );\n" - "-\tprintk(\" USLEEP, USLEEP_POLL=%d USLEEP_SLEEP=%d\", USLEEP_POLL, USLEEP_SLEEP);\n" - "+\tprintk(\" USLEEP_POLL=%d USLEEP_SLEEP=%d\", USLEEP_POLL, USLEEP_SLEEP);\n" - " \tprintk(\" generic release=%d\", NCR5380_PUBLIC_RELEASE);\n" - " \tif (((struct NCR5380_hostdata *) instance->hostdata)->flags & FLAG_NCR53C400) {\n" - " \t\tprintk(\" ncr53c400 release=%d\", NCR53C400_PUBLIC_RELEASE);\n" - "Index: linux/drivers/scsi/pas16.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/pas16.c\t2014-10-02 16:55:51.000000000 +1000\n" - "+++ linux/drivers/scsi/pas16.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -1,6 +1,5 @@\n" - " #define AUTOSENSE\n" - " #define PSEUDO_DMA\n" - "-#define FOO\n" - " #define UNSAFE /* Not unsafe for PAS16 -- use it */\n" - " #define PDEBUG 0\n" - " \n" - "@@ -52,8 +51,6 @@\n" - " * increase compared to polled I/O.\n" - " *\n" - " * PARITY - enable parity checking. Not supported.\n" - "- * \n" - "- * SCSI2 - enable support for SCSI-II tagged queueing. Untested.\n" - " *\n" - " * UNSAFE - leave interrupts enabled during pseudo-DMA transfers. This\n" - " *\t parameter comes from the NCR5380 code. It is NOT unsafe with\n" - "@@ -63,8 +60,6 @@\n" - " *\t want to use UNSAFE you can try defining LIMIT_TRANSFERSIZE or\n" - " *\t twiddle with the transfer size in the high level code.\n" - " *\n" - "- * USLEEP - enable support for devices that don't disconnect. Untested.\n" - "- *\n" - " * The card is detected and initialized in one of several ways : \n" - " * 1. Autoprobe (default) - There are many different models of\n" - " * the Pro Audio Spectrum/Studio 16, and I only have one of\n" - "Index: linux/drivers/scsi/g_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/g_NCR5380.c\t2014-10-02 16:55:28.000000000 +1000\n" - "+++ linux/drivers/scsi/g_NCR5380.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -44,10 +44,6 @@\n" - " *\n" - " * PARITY - enable parity checking. Not supported.\n" - " *\n" - "- * SCSI2 - enable support for SCSI-II tagged queueing. Untested.\n" - "- *\n" - "- * USLEEP - enable support for devices that don't disconnect. Untested.\n" - "- *\n" - " * The card is detected and initialized in one of several ways : \n" - " * 1. With command line overrides - NCR5380=port,irq may be \n" - " * used on the LILO command line to override the defaults.\n" - "@@ -79,7 +75,6 @@\n" - " */\n" - " \n" - " /* settings for DTC3181E card with only Mustek scanner attached */\n" - "-#define USLEEP\n" - " #define USLEEP_POLL\t1\n" - " #define USLEEP_SLEEP\t20\n" - " #define USLEEP_WAITLONG\t500\n" - "Index: linux/drivers/scsi/arm/oak.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/arm/oak.c\t2014-10-02 16:55:28.000000000 +1000\n" - "+++ linux/drivers/scsi/arm/oak.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -29,7 +29,6 @@\n" - " \n" - " #define NCR5380_read(reg)\t\treadb(_base + ((reg) << 2))\n" - " #define NCR5380_write(reg, value)\twriteb(value, _base + ((reg) << 2))\n" - "-#define NCR5380_intr\t\t\toakscsi_intr\n" - " #define NCR5380_queue_command\t\toakscsi_queue_command\n" - " #define NCR5380_show_info\t\toakscsi_show_info\n" - " #define NCR5380_write_info\t\toakscsi_write_info\n" - "Index: linux/drivers/scsi/g_NCR5380.h\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/g_NCR5380.h\t2014-10-02 16:55:28.000000000 +1000\n" - "+++ linux/drivers/scsi/g_NCR5380.h\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -118,7 +118,6 @@ static const char* generic_NCR5380_info(\n" - " #define NCR5380_bus_reset generic_NCR5380_bus_reset\n" - " #define NCR5380_pread generic_NCR5380_pread\n" - " #define NCR5380_pwrite generic_NCR5380_pwrite\n" - "-#define NCR5380_proc_info notyet_generic_proc_info\n" - " \n" - " #define BOARD_NCR5380\t0\n" - " #define BOARD_NCR53C400\t1\n" - "Index: linux/drivers/scsi/t128.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/t128.c\t2014-10-02 16:55:51.000000000 +1000\n" - "+++ linux/drivers/scsi/t128.c\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -47,17 +47,12 @@\n" - " * increase compared to polled I/O.\n" - " *\n" - " * PARITY - enable parity checking. Not supported.\n" - "- * \n" - "- * SCSI2 - enable support for SCSI-II tagged queueing. Untested.\n" - "- *\n" - " *\n" - " * UNSAFE - leave interrupts enabled during pseudo-DMA transfers. You\n" - " * only really want to use this if you're having a problem with\n" - " * dropped characters during high speed communications, and even\n" - " * then, you're going to be better off twiddling with transfersize.\n" - " *\n" - "- * USLEEP - enable support for devices that don't disconnect. Untested.\n" - "- *\n" - " * The card is detected and initialized in one of several ways : \n" - " * 1. Autoprobe (default) - since the board is memory mapped, \n" - " * a BIOS signature is scanned for to locate the registers.\n" - "Index: linux/drivers/scsi/sun3_scsi.h\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/sun3_scsi.h\t2014-10-02 16:55:50.000000000 +1000\n" - "+++ linux/drivers/scsi/sun3_scsi.h\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -89,7 +89,6 @@ static int sun3scsi_release (struct Scsi\n" - " #define NCR5380_read(reg) sun3scsi_read(reg)\n" - " #define NCR5380_write(reg, value) sun3scsi_write(reg, value)\n" - " \n" - "-#define NCR5380_intr sun3scsi_intr\n" - " #define NCR5380_queue_command sun3scsi_queue_command\n" - " #define NCR5380_bus_reset sun3scsi_bus_reset\n" - " #define NCR5380_abort sun3scsi_abort\n" - "Index: linux/drivers/scsi/atari_scsi.h\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/atari_scsi.h\t2014-10-02 16:55:28.000000000 +1000\n" - "+++ linux/drivers/scsi/atari_scsi.h\t2014-10-02 16:55:52.000000000 +1000\n" - "@@ -44,7 +44,6 @@\n" - " #define NCR5380_read(reg)\t\t atari_scsi_reg_read( reg )\n" - " #define NCR5380_write(reg, value) atari_scsi_reg_write( reg, value )\n" - " \n" - "-#define NCR5380_intr atari_scsi_intr\n" - " #define NCR5380_queue_command atari_scsi_queue_command\n" - " #define NCR5380_abort atari_scsi_abort\n" - #define NCR5380_show_info atari_scsi_show_info + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: ncr5380-remove-unused-macros\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141002/52ba4ecb/attachment.ksh> -60bca69ffdf6285b59bc0318577a795802ab6a61b070142d55602e8db1528e42 +6ab9ebcffbb8550ed9a23a289b6764441f6b93f3a392686f38482afbe940d81b
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.