Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ NCR5380_print_options(struct Scsi_Host *instance) 
	       " 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);

drivers/scsi/arm/oak.c

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/scsi/atari_scsi.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/scsi/g_NCR5380.c

+0 −5
Original line number Diff line number Diff line
@@ -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

drivers/scsi/g_NCR5380.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ static const char* generic_NCR5380_info(struct Scsi_Host *); 
#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