[PATCH] kill unused scsi_device fields

drivers/scsi/scsi.h

@@ -355,14 +355,12 @@ struct scsi_device {
 	char * model;		/* ... after scan; point to static string */
 	char * rev;		/* ... "nullnullnullnull" before scan */
 	unsigned char current_tag;	/* current tag */
-//	unsigned char sync_min_period;	/* Not less than this period */
-//	unsigned char sync_max_offset;	/* Not greater than this offset */
 	struct scsi_target      *sdev_target;   /* used only for single_lun */
 
 	unsigned online:1;
+
 	unsigned writeable:1;
 	unsigned removable:1;
-	unsigned random:1;
 	unsigned changed:1;	/* Data invalid due to media change */
 	unsigned busy:1;	/* Used to prevent races */
 	unsigned lockable:1;	/* Able to prevent media removal */
@@ -388,9 +386,6 @@ struct scsi_device {
 				     * because we did a bus reset. */
 	unsigned use_10_for_rw:1; /* first try 10-byte read / write */
 	unsigned use_10_for_ms:1; /* first try 10-byte mode sense/select */
-	unsigned remap:1;	/* support remapping  */
-//	unsigned sync:1;	/* Sync transfer state, managed by host */
-//	unsigned wide:1;	/* WIDE transfer state, managed by host */
 	unsigned no_start_on_add:1;	/* do not issue start on add */
 
 	unsigned int device_blocked;	/* Device returned QUEUE_FULL. */

drivers/scsi/scsi_lib.c

@@ -730,17 +730,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, int good_sectors,
 	 * can choose a block to remap, etc.
 	 */
 	if (driver_byte(result) != 0) {
-		if (suggestion(result) == SUGGEST_REMAP) {
-#ifdef REMAP
-			/*
-			 * Not yet implemented.  A read will fail after being remapped,
-			 * a write will call the strategy routine again.
-			 */
-			if (cmd->device->remap) {
-				result = 0;
-			}
-#endif
-		}
 		if ((cmd->sense_buffer[0] & 0x7f) == 0x70) {
 			/*
 			 * If the device is in the process of becoming ready,

drivers/scsi/scsi_scan.c

@@ -541,8 +541,6 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
 		printk(KERN_INFO "scsi: unknown device type %d\n", sdev->type);
 	}
 
-	sdev->random = (sdev->type == TYPE_TAPE) ? 0 : 1;
-
 	scsi_set_name(sdev, inq_result);
 
 	print_inquiry(inq_result);

drivers/scsi/sd.c

@@ -1271,8 +1271,6 @@ sd_init_onedisk(struct scsi_disk * sdkp, struct gendisk *disk)
 		
 	SRpnt->sr_device->use_10_for_rw = 1;
 	SRpnt->sr_device->use_10_for_ms = 0;
-	SRpnt->sr_device->remap = 1;
-
  leave:
 	scsi_release_request(SRpnt);
 

drivers/scsi/sr.c

@@ -526,7 +526,6 @@ static int sr_probe(struct device *dev)
 	sdev->sector_size = 2048;	/* A guess, just in case */
 	sdev->use_10_for_rw = 1;
 	sdev->use_10_for_ms = 0;
-	sdev->remap = 1;
 
 	/* FIXME: need to handle a get_capabilities failure properly ?? */
 	get_capabilities(cd);