Commit 48f16c9b authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig

ncr5380: Remove unused macros

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: 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 925e4610
...@@ -649,7 +649,7 @@ NCR5380_print_options(struct Scsi_Host *instance) ...@@ -649,7 +649,7 @@ NCR5380_print_options(struct Scsi_Host *instance)
" UNSAFE " " UNSAFE "
#endif #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); printk(" generic release=%d", NCR5380_PUBLIC_RELEASE);
if (((struct NCR5380_hostdata *) instance->hostdata)->flags & FLAG_NCR53C400) { if (((struct NCR5380_hostdata *) instance->hostdata)->flags & FLAG_NCR53C400) {
printk(" ncr53c400 release=%d", NCR53C400_PUBLIC_RELEASE); printk(" ncr53c400 release=%d", NCR53C400_PUBLIC_RELEASE);
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#define NCR5380_read(reg) readb(_base + ((reg) << 2)) #define NCR5380_read(reg) readb(_base + ((reg) << 2))
#define NCR5380_write(reg, value) writeb(value, _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_queue_command oakscsi_queue_command
#define NCR5380_show_info oakscsi_show_info #define NCR5380_show_info oakscsi_show_info
#define NCR5380_write_info oakscsi_write_info #define NCR5380_write_info oakscsi_write_info
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#define NCR5380_read(reg) atari_scsi_reg_read( reg ) #define NCR5380_read(reg) atari_scsi_reg_read( reg )
#define NCR5380_write(reg, value) atari_scsi_reg_write( reg, value ) #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_queue_command atari_scsi_queue_command
#define NCR5380_abort atari_scsi_abort #define NCR5380_abort atari_scsi_abort
#define NCR5380_show_info atari_scsi_show_info #define NCR5380_show_info atari_scsi_show_info
......
...@@ -44,10 +44,6 @@ ...@@ -44,10 +44,6 @@
* *
* PARITY - enable parity checking. Not supported. * 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 : * The card is detected and initialized in one of several ways :
* 1. With command line overrides - NCR5380=port,irq may be * 1. With command line overrides - NCR5380=port,irq may be
* used on the LILO command line to override the defaults. * used on the LILO command line to override the defaults.
...@@ -79,7 +75,6 @@ ...@@ -79,7 +75,6 @@
*/ */
/* settings for DTC3181E card with only Mustek scanner attached */ /* settings for DTC3181E card with only Mustek scanner attached */
#define USLEEP
#define USLEEP_POLL 1 #define USLEEP_POLL 1
#define USLEEP_SLEEP 20 #define USLEEP_SLEEP 20
#define USLEEP_WAITLONG 500 #define USLEEP_WAITLONG 500
......
...@@ -118,7 +118,6 @@ static const char* generic_NCR5380_info(struct Scsi_Host *); ...@@ -118,7 +118,6 @@ static const char* generic_NCR5380_info(struct Scsi_Host *);
#define NCR5380_bus_reset generic_NCR5380_bus_reset #define NCR5380_bus_reset generic_NCR5380_bus_reset
#define NCR5380_pread generic_NCR5380_pread #define NCR5380_pread generic_NCR5380_pread
#define NCR5380_pwrite generic_NCR5380_pwrite #define NCR5380_pwrite generic_NCR5380_pwrite
#define NCR5380_proc_info notyet_generic_proc_info
#define BOARD_NCR5380 0 #define BOARD_NCR5380 0
#define BOARD_NCR53C400 1 #define BOARD_NCR53C400 1
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include "NCR5380.h" #include "NCR5380.h"
#define RESET_BOOT #define RESET_BOOT
#define DRIVER_SETUP
extern void via_scsi_clear(void); extern void via_scsi_clear(void);
...@@ -113,7 +112,6 @@ static __inline__ void macscsi_write(struct Scsi_Host *instance, int reg, int va ...@@ -113,7 +112,6 @@ static __inline__ void macscsi_write(struct Scsi_Host *instance, int reg, int va
*/ */
static int __init mac_scsi_setup(char *str) { static int __init mac_scsi_setup(char *str) {
#ifdef DRIVER_SETUP
int ints[7]; int ints[7];
(void)get_options( str, ARRAY_SIZE(ints), ints); (void)get_options( str, ARRAY_SIZE(ints), ints);
...@@ -166,7 +164,6 @@ static int __init mac_scsi_setup(char *str) { ...@@ -166,7 +164,6 @@ static int __init mac_scsi_setup(char *str) {
} }
#endif /* SUPPORT_TAGS */ #endif /* SUPPORT_TAGS */
#endif /* DRIVER_SETUP */
return 1; return 1;
} }
......
#define AUTOSENSE #define AUTOSENSE
#define PSEUDO_DMA #define PSEUDO_DMA
#define FOO
#define UNSAFE /* Not unsafe for PAS16 -- use it */ #define UNSAFE /* Not unsafe for PAS16 -- use it */
#define PDEBUG 0 #define PDEBUG 0
...@@ -52,8 +51,6 @@ ...@@ -52,8 +51,6 @@
* increase compared to polled I/O. * increase compared to polled I/O.
* *
* PARITY - enable parity checking. Not supported. * PARITY - enable parity checking. Not supported.
*
* SCSI2 - enable support for SCSI-II tagged queueing. Untested.
* *
* UNSAFE - leave interrupts enabled during pseudo-DMA transfers. This * UNSAFE - leave interrupts enabled during pseudo-DMA transfers. This
* parameter comes from the NCR5380 code. It is NOT unsafe with * parameter comes from the NCR5380 code. It is NOT unsafe with
...@@ -63,8 +60,6 @@ ...@@ -63,8 +60,6 @@
* want to use UNSAFE you can try defining LIMIT_TRANSFERSIZE or * want to use UNSAFE you can try defining LIMIT_TRANSFERSIZE or
* twiddle with the transfer size in the high level code. * 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 : * The card is detected and initialized in one of several ways :
* 1. Autoprobe (default) - There are many different models of * 1. Autoprobe (default) - There are many different models of
* the Pro Audio Spectrum/Studio 16, and I only have one of * the Pro Audio Spectrum/Studio 16, and I only have one of
......
...@@ -43,10 +43,6 @@ ...@@ -43,10 +43,6 @@
* Options : * Options :
* *
* PARITY - enable parity checking. Not supported. * 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 #define AUTOSENSE
...@@ -79,18 +75,7 @@ ...@@ -79,18 +75,7 @@
extern int sun3_map_test(unsigned long, char *); extern int sun3_map_test(unsigned long, char *);
#define USE_WRAPPER
/*#define RESET_BOOT */ /*#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 */ /* #define SUPPORT_TAGS */
#ifdef SUN3_SCSI_VME #ifdef SUN3_SCSI_VME
......
...@@ -89,7 +89,6 @@ static int sun3scsi_release (struct Scsi_Host *); ...@@ -89,7 +89,6 @@ static int sun3scsi_release (struct Scsi_Host *);
#define NCR5380_read(reg) sun3scsi_read(reg) #define NCR5380_read(reg) sun3scsi_read(reg)
#define NCR5380_write(reg, value) sun3scsi_write(reg, value) #define NCR5380_write(reg, value) sun3scsi_write(reg, value)
#define NCR5380_intr sun3scsi_intr
#define NCR5380_queue_command sun3scsi_queue_command #define NCR5380_queue_command sun3scsi_queue_command
#define NCR5380_bus_reset sun3scsi_bus_reset #define NCR5380_bus_reset sun3scsi_bus_reset
#define NCR5380_abort sun3scsi_abort #define NCR5380_abort sun3scsi_abort
......
...@@ -47,17 +47,12 @@ ...@@ -47,17 +47,12 @@
* increase compared to polled I/O. * increase compared to polled I/O.
* *
* PARITY - enable parity checking. Not supported. * PARITY - enable parity checking. Not supported.
*
* SCSI2 - enable support for SCSI-II tagged queueing. Untested.
*
* *
* UNSAFE - leave interrupts enabled during pseudo-DMA transfers. You * UNSAFE - leave interrupts enabled during pseudo-DMA transfers. You
* only really want to use this if you're having a problem with * only really want to use this if you're having a problem with
* dropped characters during high speed communications, and even * dropped characters during high speed communications, and even
* then, you're going to be better off twiddling with transfersize. * 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 : * The card is detected and initialized in one of several ways :
* 1. Autoprobe (default) - since the board is memory mapped, * 1. Autoprobe (default) - since the board is memory mapped,
* a BIOS signature is scanned for to locate the registers. * a BIOS signature is scanned for to locate the registers.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment