summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-03 21:52:44 +0200
committerJames Bottomley <jejb@titanic>2005-04-18 19:31:52 +0200
commitb6651129cc27d56a9cbefcb5f713cea7706fd6b7 (patch)
tree2b3f664a499ff568cefb5718bfa0b4998a4c43be /drivers/scsi
parent[PATCH] md: remove a number of misleading calls to MD_BUG (diff)
downloadlinux-b6651129cc27d56a9cbefcb5f713cea7706fd6b7.tar.xz
linux-b6651129cc27d56a9cbefcb5f713cea7706fd6b7.zip
[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/scsi')
-rw-r--r--drivers/scsi/scsi_ioctl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 68c9728dfbbb..7a6b530115ac 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -27,11 +27,6 @@
#define NORMAL_RETRIES 5
#define IOCTL_NORMAL_TIMEOUT (10 * HZ)
-#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 ) /* ZIP-250 on parallel port takes as long! */
#define MAX_BUF PAGE_SIZE