summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-03 14:52:44 -0500
committerJames Bottomley <jejb@titanic>2005-04-18 12:31:52 -0500
commitb6651129cc27d56a9cbefcb5f713cea7706fd6b7 (patch)
tree2b3f664a499ff568cefb5718bfa0b4998a4c43be /drivers/block
parenta757e64cfa400391041ed7953f0290c34a820c93 (diff)
[PATCH] consolidate timeout defintions in scsi.h
Adapted from a patch in SuSE's kernel SRPM. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/scsi_ioctl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
index 689527a89de7..681871ca5d60 100644
--- a/drivers/block/scsi_ioctl.c
+++ b/drivers/block/scsi_ioctl.c
@@ -328,11 +328,6 @@ static int sg_io(struct file *file, request_queue_t *q,
return 0;
}
-#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ)
-#define START_STOP_TIMEOUT (60 * HZ)
-#define MOVE_MEDIUM_TIMEOUT (5 * 60 * HZ)
-#define READ_ELEMENT_STATUS_TIMEOUT (5 * 60 * HZ)
-#define READ_DEFECT_DATA_TIMEOUT (60 * HZ )
#define OMAX_SB_LEN 16 /* For backward compatibility */
static int sg_scsi_ioctl(struct file *file, request_queue_t *q,