summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/advansys.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic>2005-04-18 13:45:00 -0500
committerJames Bottomley <jejb@titanic>2005-04-18 13:45:00 -0500
commitc46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch)
tree284912295d46a861930d0619788a650f56c2a29b /drivers/scsi/advansys.c
parentc2a9331c62216e222a08de8dd58559367fef0af6 (diff)
parentf59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff)
downloadop-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.zip
op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.tar.gz
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/scsi/advansys.c')
-rw-r--r--drivers/scsi/advansys.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 9962c51..04cb5c4 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -9198,16 +9198,13 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
s->use_sg, s->sglist_len, s->abort_reason);
printk(
-" serial_number 0x%x, serial_number_at_timeout 0x%x, retries %d, allowed %d\n",
- (unsigned) s->serial_number, (unsigned) s->serial_number_at_timeout,
- s->retries, s->allowed);
+" serial_number 0x%x, retries %d, allowed %d\n",
+ (unsigned) s->serial_number, s->retries, s->allowed);
printk(
" 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,
OpenPOWER on IntegriCloud