diff options
Diffstat (limited to 'drivers/scsi/eata_pio.c')
-rw-r--r-- | drivers/scsi/eata_pio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 73260e590f22..96180bb47e41 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
@@ -375,7 +375,7 @@ static int eata_pio_queue(struct scsi_cmnd *cmd, | |||
375 | 375 | ||
376 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, | 376 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, |
377 | "eata_pio_queue pid %ld, y %d\n", | 377 | "eata_pio_queue pid %ld, y %d\n", |
378 | cmd->pid, y)); | 378 | cmd->serial_number, y)); |
379 | 379 | ||
380 | cmd->scsi_done = (void *) done; | 380 | cmd->scsi_done = (void *) done; |
381 | 381 | ||
@@ -420,7 +420,7 @@ static int eata_pio_queue(struct scsi_cmnd *cmd, | |||
420 | cmd->result = DID_BUS_BUSY << 16; | 420 | cmd->result = DID_BUS_BUSY << 16; |
421 | scmd_printk(KERN_NOTICE, cmd, | 421 | scmd_printk(KERN_NOTICE, cmd, |
422 | "eata_pio_queue pid %ld, HBA busy, " | 422 | "eata_pio_queue pid %ld, HBA busy, " |
423 | "returning DID_BUS_BUSY, done.\n", cmd->pid); | 423 | "returning DID_BUS_BUSY, done.\n", cmd->serial_number); |
424 | done(cmd); | 424 | done(cmd); |
425 | cp->status = FREE; | 425 | cp->status = FREE; |
426 | return 0; | 426 | return 0; |
@@ -435,7 +435,7 @@ static int eata_pio_queue(struct scsi_cmnd *cmd, | |||
435 | 435 | ||
436 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, | 436 | DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd, |
437 | "Queued base %#.4lx pid: %ld " | 437 | "Queued base %#.4lx pid: %ld " |
438 | "slot %d irq %d\n", sh->base, cmd->pid, y, sh->irq)); | 438 | "slot %d irq %d\n", sh->base, cmd->serial_number, y, sh->irq)); |
439 | 439 | ||
440 | return 0; | 440 | return 0; |
441 | } | 441 | } |
@@ -446,7 +446,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd) | |||
446 | 446 | ||
447 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, | 447 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, |
448 | "eata_pio_abort called pid: %ld\n", | 448 | "eata_pio_abort called pid: %ld\n", |
449 | cmd->pid)); | 449 | cmd->serial_number)); |
450 | 450 | ||
451 | while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) | 451 | while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) |
452 | if (--loop == 0) { | 452 | if (--loop == 0) { |
@@ -482,7 +482,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) | |||
482 | 482 | ||
483 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, | 483 | DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd, |
484 | "eata_pio_reset called pid:%ld\n", | 484 | "eata_pio_reset called pid:%ld\n", |
485 | cmd->pid)); | 485 | cmd->serial_number)); |
486 | 486 | ||
487 | spin_lock_irq(host->host_lock); | 487 | spin_lock_irq(host->host_lock); |
488 | 488 | ||
@@ -501,7 +501,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) | |||
501 | 501 | ||
502 | sp = HD(cmd)->ccb[x].cmd; | 502 | sp = HD(cmd)->ccb[x].cmd; |
503 | HD(cmd)->ccb[x].status = RESET; | 503 | HD(cmd)->ccb[x].status = RESET; |
504 | printk(KERN_WARNING "eata_pio_reset: slot %d in reset, pid %ld.\n", x, sp->pid); | 504 | printk(KERN_WARNING "eata_pio_reset: slot %d in reset, pid %ld.\n", x, sp->serial_number); |
505 | 505 | ||
506 | if (sp == NULL) | 506 | if (sp == NULL) |
507 | panic("eata_pio_reset: slot %d, sp==NULL.\n", x); | 507 | panic("eata_pio_reset: slot %d, sp==NULL.\n", x); |