tree 7e3ca6bb10436c201359a49945e9a4c6f1657a66 parent db9dff366ba78085d0323364fadbf09bec0e77ee author <[EMAIL PROTECTED]> Mon, 04 Apr 2005 00:55:06 -0500 committer James Bottomley <[EMAIL PROTECTED]> Mon, 18 Apr 2005 22:32:47 -0500
[PATCH] scsi: remove unused scsi_cmnd->internal_timeout field scsi_cmnd->internal_timeout field doesn't have any meaning anymore. Kill the field. Signed-off-by: Tejun Heo <[EMAIL PROTECTED]> Signed-off-by: James Bottomley <[EMAIL PROTECTED]> scsi/advansys.c | 2 -- scsi/pci2000.c | 4 ++-- scsi/scsi.c | 1 - scsi/scsi_error.c | 1 - scsi/scsi_lib.c | 1 - scsi/scsi_priv.h | 5 ----- scsi/scsi_cmnd.h | 6 ------ 7 files changed, 2 insertions(+), 18 deletions(-) Index: drivers/scsi/advansys.c =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/drivers/scsi/advansys.c (mode:100644 sha1:9962c51dc2a7d2803cf11a1ee12016625160f8ca) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/drivers/scsi/advansys.c (mode:100644 sha1:edeb333d816172e8779244084257ccfecc323c56) @@ -9206,8 +9206,6 @@ " timeout_per_command %d, timeout_total %d, timeout %d\n", s->timeout_per_command, s->timeout_total, s->timeout); - printk(" internal_timeout %u\n", s->internal_timeout); - printk( " scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n", (ulong) s->scsi_done, (ulong) s->done, Index: drivers/scsi/pci2000.c =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/drivers/scsi/pci2000.c (mode:100644 sha1:60ce1cce9497c22f81b7c5c00984a8963ce98e80) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/drivers/scsi/pci2000.c (mode:100644 sha1:d58f303127f506ea2ea21f6c4f9c8e532e8eae48) @@ -438,8 +438,8 @@ if ( bus ) { DEB (if(*cdb) printk ("\nCDB: %X- %X %X %X %X %X %X %X %X %X %X ", SCpnt->cmd_len, cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8], cdb[9])); - DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d, internal_timout: %d", SCpnt->timeout_per_command, - SCpnt->timeout_total, SCpnt->timeout, SCpnt->internal_timeout)); + DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d", SCpnt->timeout_per_command, + SCpnt->timeout_total, SCpnt->timeout)); outl (SCpnt->timeout_per_command, padapter->mb1); outb_p (CMD_SCSI_TIMEOUT, padapter->cmd); if ( WaitReady (padapter) ) Index: drivers/scsi/scsi.c =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/drivers/scsi/scsi.c (mode:100644 sha1:5dc84669616de6b80255656b7fcda768268e9c0a) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/drivers/scsi/scsi.c (mode:100644 sha1:95de4d0f4fd1613c1ec16895bce5c8039459074c) @@ -716,7 +716,6 @@ /* * Start the timer ticking. */ - cmd->internal_timeout = NORMAL_TIMEOUT; cmd->abort_reason = 0; cmd->result = 0; Index: drivers/scsi/scsi_error.c =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/drivers/scsi/scsi_error.c (mode:100644 sha1:9bc597bd13bad212303ed6a6ffd60bf83156757c) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/drivers/scsi/scsi_error.c (mode:100644 sha1:173abb88e3e8f8414daf6e5ff97a3a34060c77ec) @@ -1839,7 +1839,6 @@ scmd->bufflen = 0; scmd->request_buffer = NULL; scmd->request_bufflen = 0; - scmd->internal_timeout = NORMAL_TIMEOUT; scmd->abort_reason = DID_ABORT; scmd->cmd_len = 0; Index: drivers/scsi/scsi_lib.c =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/drivers/scsi/scsi_lib.c (mode:100644 sha1:7cbc4127fb5a6375e870920dd3f7b19199d59a90) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/drivers/scsi/scsi_lib.c (mode:100644 sha1:19dd911d9f7ad27cb45b642a325f0981a73178f0) @@ -320,7 +320,6 @@ memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd)); cmd->buffer = cmd->request_buffer; cmd->bufflen = cmd->request_bufflen; - cmd->internal_timeout = NORMAL_TIMEOUT; cmd->abort_reason = 0; return 1; Index: drivers/scsi/scsi_priv.h =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/drivers/scsi/scsi_priv.h (mode:100644 sha1:aca3b39fe71049088e474c9fc3db3881ce15ea09) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/drivers/scsi/scsi_priv.h (mode:100644 sha1:c01580df4476bc1acc70a41bd23434cc067fdf67) @@ -30,11 +30,6 @@ #define SCSI_REQ_MAGIC 0x75F6D354 /* - * Flag bit for the internal_timeout array - */ -#define NORMAL_TIMEOUT 0 - -/* * Scsi Error Handler Flags */ #define scsi_eh_eflags_chk(scp, flags) \ Index: include/scsi/scsi_cmnd.h =================================================================== --- ae86a60cf83c3d897f9488e90fca4b36cd545a1a/include/scsi/scsi_cmnd.h (mode:100644 sha1:9d9871c28abdc2a3e8932a9819001aadf41cb0cd) +++ 7e3ca6bb10436c201359a49945e9a4c6f1657a66/include/scsi/scsi_cmnd.h (mode:100644 sha1:ae45d6f8f98cb39c111956ceb4de4730cace92df) @@ -65,12 +65,6 @@ int timeout_total; int timeout; - /* - * We handle the timeout differently if it happens when a reset, - * abort, etc are in process. - */ - unsigned volatile char internal_timeout; - unsigned char cmd_len; unsigned char old_cmd_len; enum dma_data_direction sc_data_direction; - To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html