[PATCH] remove some dead declarations from the scsi headers

drivers/scsi/hosts.h

@@ -53,8 +53,6 @@
  * type of host adapter that is supported on the system.
  */
 
-typedef struct scsi_disk Disk;
-
 typedef struct	SHT
 {
     /* Used with loadable modules so that we know when it is safe to unload */
@@ -515,13 +513,6 @@ extern void scsi_proc_host_mkdir(Scsi_Host_Template *);
 extern void scsi_proc_host_add(struct Scsi_Host *);
 extern void scsi_proc_host_rm(struct Scsi_Host *);
 
-/*
- *  scsi_init initializes the scsi hosts.
- */
-
-extern int next_scsi_host;
-
-unsigned int scsi_init(void);
 extern void scsi_register_blocked_host(struct Scsi_Host *);
 extern void scsi_deregister_blocked_host(struct Scsi_Host *);
 
@@ -543,10 +534,6 @@ static inline void scsi_set_pci_device(struct Scsi_Host *shost,
  */
 extern void scan_scsis(struct Scsi_Host *, uint, uint, uint, uint);
 
-extern void scsi_mark_host_reset(struct Scsi_Host *);
-
-#define BLANK_HOST {"", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
 struct Scsi_Device_Template
 {
     struct Scsi_Device_Template * next;

drivers/scsi/scsi.h

@@ -404,15 +404,7 @@ typedef struct scsi_request Scsi_Request;
  * Here is where we prototype most of the mid-layer.
  */
 
-/*
- *  Initializes all SCSI devices.  This scans all scsi busses.
- */
-
 extern unsigned int scsi_logging_level;		/* What do we log? */
-extern unsigned int scsi_dma_free_sectors;	/* How much room do we have left */
-extern unsigned int scsi_need_isa_buffer;	/* True if some devices need indirection
-						   * buffers */
-extern volatile int in_scan_scsis;
 
 extern struct bus_type scsi_driverfs_bus_type;
 
@@ -500,12 +492,6 @@ extern void scsi_do_req(Scsi_Request *, const void *cmnd,
 extern int scsi_insert_special_req(Scsi_Request * SRpnt, int);
 extern void scsi_init_cmd_from_req(Scsi_Cmnd *, Scsi_Request *);
 
-
-/*
- * Prototypes for functions/data in hosts.c
- */
-extern int max_scsi_hosts;
-
 /*
  * Prototypes for functions in scsi_proc.c
  */
@@ -837,25 +823,6 @@ struct scsi_cmnd {
 #define SCSI_MLQUEUE_HOST_BUSY   0x1055
 #define SCSI_MLQUEUE_DEVICE_BUSY 0x1056
 
-#define SCSI_SLEEP(QUEUE, CONDITION) {		    \
-    if (CONDITION) {			            \
-	DECLARE_WAITQUEUE(wait, current);	    \
-	add_wait_queue(QUEUE, &wait);		    \
-	for(;;) {			            \
-	set_current_state(TASK_UNINTERRUPTIBLE);    \
-	if (CONDITION) {		            \
-            if (in_interrupt())	                    \
-	        panic("scsi: trying to call schedule() in interrupt" \
-		      ", file %s, line %d.\n", __FILE__, __LINE__);  \
-	    schedule();			\
-        }				\
-	else			        \
-	    break;      		\
-	}			        \
-	remove_wait_queue(QUEUE, &wait);\
-	current->state = TASK_RUNNING;	\
-    }; }
-
 /*
  * old style reset request from external source
  * (private to sg.c and scsi_error.c, supplied by scsi_obsolete.c)

drivers/scsi/scsi_error.c

@@ -177,8 +177,7 @@ void scsi_times_out(Scsi_Cmnd *scmd)
  **/
 int scsi_block_when_processing_errors(Scsi_Device *sdev)
 {
-
-	SCSI_SLEEP(&sdev->host->host_wait, sdev->host->in_recovery);
+	wait_event(sdev->host->host_wait, (sdev->host->in_recovery == 0));
 
 	SCSI_LOG_ERROR_RECOVERY(5, printk("%s: rtn: %d\n", __FUNCTION__,
 					  sdev->online));