aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/eata_pio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/eata_pio.c')
-rw-r--r--drivers/scsi/eata_pio.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 42c6e35f801c..23beb48c79c5 100644
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -384,7 +384,9 @@ static int eata_pio_queue(struct scsi_cmnd *cmd,
384 384
385 cp->status = USED; /* claim free slot */ 385 cp->status = USED; /* claim free slot */
386 386
387 DBG(DBG_QUEUE, printk(KERN_DEBUG "eata_pio_queue pid %ld, target: %x, lun:" " %x, y %d\n", cmd->pid, cmd->device->id, cmd->device->lun, y)); 387 DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,
388 "eata_pio_queue pid %ld, y %d\n",
389 cmd->pid, y));
388 390
389 cmd->scsi_done = (void *) done; 391 cmd->scsi_done = (void *) done;
390 392
@@ -427,7 +429,9 @@ static int eata_pio_queue(struct scsi_cmnd *cmd,
427 429
428 if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) { 430 if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) {
429 cmd->result = DID_BUS_BUSY << 16; 431 cmd->result = DID_BUS_BUSY << 16;
430 printk(KERN_NOTICE "eata_pio_queue target %d, pid %ld, HBA busy, " "returning DID_BUS_BUSY, done.\n", cmd->device->id, cmd->pid); 432 scmd_printk(KERN_NOTICE, cmd,
433 "eata_pio_queue pid %ld, HBA busy, "
434 "returning DID_BUS_BUSY, done.\n", cmd->pid);
431 done(cmd); 435 done(cmd);
432 cp->status = FREE; 436 cp->status = FREE;
433 return (0); 437 return (0);
@@ -440,7 +444,9 @@ static int eata_pio_queue(struct scsi_cmnd *cmd,
440 for (x = 0; x < hd->cppadlen; x++) 444 for (x = 0; x < hd->cppadlen; x++)
441 outw(0, base + HA_RDATA); 445 outw(0, base + HA_RDATA);
442 446
443 DBG(DBG_QUEUE, printk(KERN_DEBUG "Queued base %#.4lx pid: %ld target: %x " "lun: %x slot %d irq %d\n", (long) sh->base, cmd->pid, cmd->device->id, cmd->device->lun, y, sh->irq)); 447 DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,
448 "Queued base %#.4lx pid: %ld "
449 "slot %d irq %d\n", (long) sh->base, cmd->pid, y, sh->irq));
444 450
445 return (0); 451 return (0);
446} 452}
@@ -449,8 +455,9 @@ static int eata_pio_abort(struct scsi_cmnd *cmd)
449{ 455{
450 uint loop = HZ; 456 uint loop = HZ;
451 457
452 DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_abort called pid: %ld " "target: %x lun: %x\n", cmd->pid, cmd->device->id, cmd->device->lun)); 458 DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,
453 459 "eata_pio_abort called pid: %ld\n",
460 cmd->pid));
454 461
455 while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) 462 while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)
456 if (--loop == 0) { 463 if (--loop == 0) {
@@ -484,7 +491,9 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
484 struct scsi_cmnd *sp; 491 struct scsi_cmnd *sp;
485 struct Scsi_Host *host = cmd->device->host; 492 struct Scsi_Host *host = cmd->device->host;
486 493
487 DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x\n", cmd->pid, cmd->device->id, cmd->device->lun)); 494 DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,
495 "eata_pio_reset called pid:%ld\n",
496 cmd->pid));
488 497
489 spin_lock_irq(host->host_lock); 498 spin_lock_irq(host->host_lock);
490 499