diff options
| author | <hch@lst.de> | 2005-04-03 14:52:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-16 20:13:03 -0500 |
| commit | 0890d74f295be849032fd4390ee00422dfda83b1 (patch) | |
| tree | c5f85f77b90c694e9710b204001486f1d1f67f70 /drivers | |
| parent | a757e64cfa400391041ed7953f0290c34a820c93 (diff) | |
| download | op-kernel-dev-0890d74f295be849032fd4390ee00422dfda83b1.zip op-kernel-dev-0890d74f295be849032fd4390ee00422dfda83b1.tar.gz | |
[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')
| -rw-r--r-- | drivers/block/scsi_ioctl.c | 5 | ||||
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c index 689527a..681871c 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, diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index 68c9728..7a6b530 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 |
