diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-04-04 09:42:14 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-05-01 11:22:40 -0400 |
commit | 5cd049a59913f359e7d30c11d2dc6187822e77b1 (patch) | |
tree | f1406a16f6f0b786857e4433467d7ad762e45186 /drivers/scsi/in2000.c | |
parent | f04ca1b65480df9ecbaaa797e62b063387429410 (diff) |
[SCSI] remove cmd->serial_number litter
Stop using cmd->serial_number in printks.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/in2000.c')
-rw-r--r-- | drivers/scsi/in2000.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c index 6568aab745a0..92109b126391 100644 --- a/drivers/scsi/in2000.c +++ b/drivers/scsi/in2000.c | |||
@@ -343,7 +343,7 @@ static int in2000_queuecommand_lck(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) | |||
343 | instance = cmd->device->host; | 343 | instance = cmd->device->host; |
344 | hostdata = (struct IN2000_hostdata *) instance->hostdata; | 344 | hostdata = (struct IN2000_hostdata *) instance->hostdata; |
345 | 345 | ||
346 | DB(DB_QUEUE_COMMAND, scmd_printk(KERN_DEBUG, cmd, "Q-%02x-%ld(", cmd->cmnd[0], cmd->serial_number)) | 346 | DB(DB_QUEUE_COMMAND, scmd_printk(KERN_DEBUG, cmd, "Q-%02x(", cmd->cmnd[0])) |
347 | 347 | ||
348 | /* Set up a few fields in the Scsi_Cmnd structure for our own use: | 348 | /* Set up a few fields in the Scsi_Cmnd structure for our own use: |
349 | * - host_scribble is the pointer to the next cmd in the input queue | 349 | * - host_scribble is the pointer to the next cmd in the input queue |
@@ -427,7 +427,7 @@ static int in2000_queuecommand_lck(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) | |||
427 | 427 | ||
428 | in2000_execute(cmd->device->host); | 428 | in2000_execute(cmd->device->host); |
429 | 429 | ||
430 | DB(DB_QUEUE_COMMAND, printk(")Q-%ld ", cmd->serial_number)) | 430 | DB(DB_QUEUE_COMMAND, printk(")Q ")) |
431 | return 0; | 431 | return 0; |
432 | } | 432 | } |
433 | 433 | ||
@@ -705,7 +705,7 @@ static void in2000_execute(struct Scsi_Host *instance) | |||
705 | * to search the input_Q again... | 705 | * to search the input_Q again... |
706 | */ | 706 | */ |
707 | 707 | ||
708 | DB(DB_EXECUTE, printk("%s%ld)EX-2 ", (cmd->SCp.phase) ? "d:" : "", cmd->serial_number)) | 708 | DB(DB_EXECUTE, printk("%s)EX-2 ", (cmd->SCp.phase) ? "d:" : "")) |
709 | 709 | ||
710 | } | 710 | } |
711 | 711 | ||
@@ -1149,7 +1149,7 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1149 | case CSR_XFER_DONE | PHS_COMMAND: | 1149 | case CSR_XFER_DONE | PHS_COMMAND: |
1150 | case CSR_UNEXP | PHS_COMMAND: | 1150 | case CSR_UNEXP | PHS_COMMAND: |
1151 | case CSR_SRV_REQ | PHS_COMMAND: | 1151 | case CSR_SRV_REQ | PHS_COMMAND: |
1152 | DB(DB_INTR, printk("CMND-%02x,%ld", cmd->cmnd[0], cmd->serial_number)) | 1152 | DB(DB_INTR, printk("CMND-%02x", cmd->cmnd[0])) |
1153 | transfer_pio(cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, hostdata); | 1153 | transfer_pio(cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, hostdata); |
1154 | hostdata->state = S_CONNECTED; | 1154 | hostdata->state = S_CONNECTED; |
1155 | break; | 1155 | break; |
@@ -1191,7 +1191,7 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1191 | switch (msg) { | 1191 | switch (msg) { |
1192 | 1192 | ||
1193 | case COMMAND_COMPLETE: | 1193 | case COMMAND_COMPLETE: |
1194 | DB(DB_INTR, printk("CCMP-%ld", cmd->serial_number)) | 1194 | DB(DB_INTR, printk("CCMP")) |
1195 | write_3393_cmd(hostdata, WD_CMD_NEGATE_ACK); | 1195 | write_3393_cmd(hostdata, WD_CMD_NEGATE_ACK); |
1196 | hostdata->state = S_PRE_CMP_DISC; | 1196 | hostdata->state = S_PRE_CMP_DISC; |
1197 | break; | 1197 | break; |
@@ -1329,7 +1329,7 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1329 | 1329 | ||
1330 | write_3393(hostdata, WD_SOURCE_ID, SRCID_ER); | 1330 | write_3393(hostdata, WD_SOURCE_ID, SRCID_ER); |
1331 | if (phs == 0x60) { | 1331 | if (phs == 0x60) { |
1332 | DB(DB_INTR, printk("SX-DONE-%ld", cmd->serial_number)) | 1332 | DB(DB_INTR, printk("SX-DONE")) |
1333 | cmd->SCp.Message = COMMAND_COMPLETE; | 1333 | cmd->SCp.Message = COMMAND_COMPLETE; |
1334 | lun = read_3393(hostdata, WD_TARGET_LUN); | 1334 | lun = read_3393(hostdata, WD_TARGET_LUN); |
1335 | DB(DB_INTR, printk(":%d.%d", cmd->SCp.Status, lun)) | 1335 | DB(DB_INTR, printk(":%d.%d", cmd->SCp.Status, lun)) |
@@ -1350,7 +1350,7 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1350 | 1350 | ||
1351 | in2000_execute(instance); | 1351 | in2000_execute(instance); |
1352 | } else { | 1352 | } else { |
1353 | printk("%02x:%02x:%02x-%ld: Unknown SEL_XFER_DONE phase!!---", asr, sr, phs, cmd->serial_number); | 1353 | printk("%02x:%02x:%02x: Unknown SEL_XFER_DONE phase!!---", asr, sr, phs); |
1354 | } | 1354 | } |
1355 | break; | 1355 | break; |
1356 | 1356 | ||
@@ -1417,7 +1417,7 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1417 | spin_unlock_irqrestore(instance->host_lock, flags); | 1417 | spin_unlock_irqrestore(instance->host_lock, flags); |
1418 | return IRQ_HANDLED; | 1418 | return IRQ_HANDLED; |
1419 | } | 1419 | } |
1420 | DB(DB_INTR, printk("UNEXP_DISC-%ld", cmd->serial_number)) | 1420 | DB(DB_INTR, printk("UNEXP_DISC")) |
1421 | hostdata->connected = NULL; | 1421 | hostdata->connected = NULL; |
1422 | hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); | 1422 | hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); |
1423 | hostdata->state = S_UNCONNECTED; | 1423 | hostdata->state = S_UNCONNECTED; |
@@ -1442,7 +1442,7 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1442 | */ | 1442 | */ |
1443 | 1443 | ||
1444 | write_3393(hostdata, WD_SOURCE_ID, SRCID_ER); | 1444 | write_3393(hostdata, WD_SOURCE_ID, SRCID_ER); |
1445 | DB(DB_INTR, printk("DISC-%ld", cmd->serial_number)) | 1445 | DB(DB_INTR, printk("DISC")) |
1446 | if (cmd == NULL) { | 1446 | if (cmd == NULL) { |
1447 | printk(" - Already disconnected! "); | 1447 | printk(" - Already disconnected! "); |
1448 | hostdata->state = S_UNCONNECTED; | 1448 | hostdata->state = S_UNCONNECTED; |
@@ -1575,7 +1575,6 @@ static irqreturn_t in2000_intr(int irqnum, void *dev_id) | |||
1575 | } else | 1575 | } else |
1576 | hostdata->state = S_CONNECTED; | 1576 | hostdata->state = S_CONNECTED; |
1577 | 1577 | ||
1578 | DB(DB_INTR, printk("-%ld", cmd->serial_number)) | ||
1579 | break; | 1578 | break; |
1580 | 1579 | ||
1581 | default: | 1580 | default: |
@@ -1704,7 +1703,7 @@ static int __in2000_abort(Scsi_Cmnd * cmd) | |||
1704 | prev->host_scribble = cmd->host_scribble; | 1703 | prev->host_scribble = cmd->host_scribble; |
1705 | cmd->host_scribble = NULL; | 1704 | cmd->host_scribble = NULL; |
1706 | cmd->result = DID_ABORT << 16; | 1705 | cmd->result = DID_ABORT << 16; |
1707 | printk(KERN_WARNING "scsi%d: Abort - removing command %ld from input_Q. ", instance->host_no, cmd->serial_number); | 1706 | printk(KERN_WARNING "scsi%d: Abort - removing command from input_Q. ", instance->host_no); |
1708 | cmd->scsi_done(cmd); | 1707 | cmd->scsi_done(cmd); |
1709 | return SUCCESS; | 1708 | return SUCCESS; |
1710 | } | 1709 | } |
@@ -1725,7 +1724,7 @@ static int __in2000_abort(Scsi_Cmnd * cmd) | |||
1725 | 1724 | ||
1726 | if (hostdata->connected == cmd) { | 1725 | if (hostdata->connected == cmd) { |
1727 | 1726 | ||
1728 | printk(KERN_WARNING "scsi%d: Aborting connected command %ld - ", instance->host_no, cmd->serial_number); | 1727 | printk(KERN_WARNING "scsi%d: Aborting connected command - ", instance->host_no); |
1729 | 1728 | ||
1730 | printk("sending wd33c93 ABORT command - "); | 1729 | printk("sending wd33c93 ABORT command - "); |
1731 | write_3393(hostdata, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); | 1730 | write_3393(hostdata, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); |
@@ -2270,7 +2269,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start, | |||
2270 | strcat(bp, "\nconnected: "); | 2269 | strcat(bp, "\nconnected: "); |
2271 | if (hd->connected) { | 2270 | if (hd->connected) { |
2272 | cmd = (Scsi_Cmnd *) hd->connected; | 2271 | cmd = (Scsi_Cmnd *) hd->connected; |
2273 | sprintf(tbuf, " %ld-%d:%d(%02x)", cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); | 2272 | sprintf(tbuf, " %d:%d(%02x)", cmd->device->id, cmd->device->lun, cmd->cmnd[0]); |
2274 | strcat(bp, tbuf); | 2273 | strcat(bp, tbuf); |
2275 | } | 2274 | } |
2276 | } | 2275 | } |
@@ -2278,7 +2277,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start, | |||
2278 | strcat(bp, "\ninput_Q: "); | 2277 | strcat(bp, "\ninput_Q: "); |
2279 | cmd = (Scsi_Cmnd *) hd->input_Q; | 2278 | cmd = (Scsi_Cmnd *) hd->input_Q; |
2280 | while (cmd) { | 2279 | while (cmd) { |
2281 | sprintf(tbuf, " %ld-%d:%d(%02x)", cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); | 2280 | sprintf(tbuf, " %d:%d(%02x)", cmd->device->id, cmd->device->lun, cmd->cmnd[0]); |
2282 | strcat(bp, tbuf); | 2281 | strcat(bp, tbuf); |
2283 | cmd = (Scsi_Cmnd *) cmd->host_scribble; | 2282 | cmd = (Scsi_Cmnd *) cmd->host_scribble; |
2284 | } | 2283 | } |
@@ -2287,7 +2286,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start, | |||
2287 | strcat(bp, "\ndisconnected_Q:"); | 2286 | strcat(bp, "\ndisconnected_Q:"); |
2288 | cmd = (Scsi_Cmnd *) hd->disconnected_Q; | 2287 | cmd = (Scsi_Cmnd *) hd->disconnected_Q; |
2289 | while (cmd) { | 2288 | while (cmd) { |
2290 | sprintf(tbuf, " %ld-%d:%d(%02x)", cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); | 2289 | sprintf(tbuf, " %d:%d(%02x)", cmd->device->id, cmd->device->lun, cmd->cmnd[0]); |
2291 | strcat(bp, tbuf); | 2290 | strcat(bp, tbuf); |
2292 | cmd = (Scsi_Cmnd *) cmd->host_scribble; | 2291 | cmd = (Scsi_Cmnd *) cmd->host_scribble; |
2293 | } | 2292 | } |