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/eata_pio.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/eata_pio.c')
-rw-r--r-- | drivers/scsi/eata_pio.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 4a9641e69f54..d5f8362335d3 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
@@ -372,8 +372,7 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd, | |||
372 | cp->status = USED; /* claim free slot */ | 372 | cp->status = USED; /* claim free slot */ |
373 | 373 | ||
374 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, | 374 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, |
375 | "eata_pio_queue pid %ld, y %d\n", | 375 | "eata_pio_queue 0x%p, y %d\n", cmd, y)); |
376 | cmd->serial_number, y)); | ||
377 | 376 | ||
378 | cmd->scsi_done = (void *) done; | 377 | cmd->scsi_done = (void *) done; |
379 | 378 | ||
@@ -417,8 +416,8 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd, | |||
417 | if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) { | 416 | if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) { |
418 | cmd->result = DID_BUS_BUSY << 16; | 417 | cmd->result = DID_BUS_BUSY << 16; |
419 | scmd_printk(KERN_NOTICE, cmd, | 418 | scmd_printk(KERN_NOTICE, cmd, |
420 | "eata_pio_queue pid %ld, HBA busy, " | 419 | "eata_pio_queue pid 0x%p, HBA busy, " |
421 | "returning DID_BUS_BUSY, done.\n", cmd->serial_number); | 420 | "returning DID_BUS_BUSY, done.\n", cmd); |
422 | done(cmd); | 421 | done(cmd); |
423 | cp->status = FREE; | 422 | cp->status = FREE; |
424 | return 0; | 423 | return 0; |
@@ -432,8 +431,8 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd, | |||
432 | outw(0, base + HA_RDATA); | 431 | outw(0, base + HA_RDATA); |
433 | 432 | ||
434 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, | 433 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, |
435 | "Queued base %#.4lx pid: %ld " | 434 | "Queued base %#.4lx cmd: 0x%p " |
436 | "slot %d irq %d\n", sh->base, cmd->serial_number, y, sh->irq)); | 435 | "slot %d irq %d\n", sh->base, cmd, y, sh->irq)); |
437 | 436 | ||
438 | return 0; | 437 | return 0; |
439 | } | 438 | } |
@@ -445,8 +444,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd) | |||
445 | unsigned int loop = 100; | 444 | unsigned int loop = 100; |
446 | 445 | ||
447 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, | 446 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, |
448 | "eata_pio_abort called pid: %ld\n", | 447 | "eata_pio_abort called pid: 0x%p\n", cmd)); |
449 | cmd->serial_number)); | ||
450 | 448 | ||
451 | while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) | 449 | while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) |
452 | if (--loop == 0) { | 450 | if (--loop == 0) { |
@@ -481,8 +479,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) | |||
481 | struct Scsi_Host *host = cmd->device->host; | 479 | struct Scsi_Host *host = cmd->device->host; |
482 | 480 | ||
483 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, | 481 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, |
484 | "eata_pio_reset called pid:%ld\n", | 482 | "eata_pio_reset called\n")); |
485 | cmd->serial_number)); | ||
486 | 483 | ||
487 | spin_lock_irq(host->host_lock); | 484 | spin_lock_irq(host->host_lock); |
488 | 485 | ||
@@ -501,7 +498,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) | |||
501 | 498 | ||
502 | sp = HD(cmd)->ccb[x].cmd; | 499 | sp = HD(cmd)->ccb[x].cmd; |
503 | HD(cmd)->ccb[x].status = RESET; | 500 | HD(cmd)->ccb[x].status = RESET; |
504 | printk(KERN_WARNING "eata_pio_reset: slot %d in reset, pid %ld.\n", x, sp->serial_number); | 501 | printk(KERN_WARNING "eata_pio_reset: slot %d in reset.\n", x); |
505 | 502 | ||
506 | if (sp == NULL) | 503 | if (sp == NULL) |
507 | panic("eata_pio_reset: slot %d, sp==NULL.\n", x); | 504 | panic("eata_pio_reset: slot %d, sp==NULL.\n", x); |