diff options
Diffstat (limited to 'drivers/scsi/NCR5380.c')
-rw-r--r-- | drivers/scsi/NCR5380.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 5e71a0beafca..770fa841e389 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
@@ -86,6 +86,7 @@ | |||
86 | * 5. Test linked command handling code after Eric is ready with | 86 | * 5. Test linked command handling code after Eric is ready with |
87 | * the high level code. | 87 | * the high level code. |
88 | */ | 88 | */ |
89 | #include <scsi/scsi_dbg.h> | ||
89 | 90 | ||
90 | #if (NDEBUG & NDEBUG_LISTS) | 91 | #if (NDEBUG & NDEBUG_LISTS) |
91 | #define LIST(x,y) {printk("LINE:%d Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); } | 92 | #define LIST(x,y) {printk("LINE:%d Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); } |
@@ -2371,7 +2372,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { | |||
2371 | * 3..length+1 arguments | 2372 | * 3..length+1 arguments |
2372 | * | 2373 | * |
2373 | * Start the extended message buffer with the EXTENDED_MESSAGE | 2374 | * Start the extended message buffer with the EXTENDED_MESSAGE |
2374 | * byte, since print_msg() wants the whole thing. | 2375 | * byte, since scsi_print_msg() wants the whole thing. |
2375 | */ | 2376 | */ |
2376 | extended_msg[0] = EXTENDED_MESSAGE; | 2377 | extended_msg[0] = EXTENDED_MESSAGE; |
2377 | /* Accept first byte by clearing ACK */ | 2378 | /* Accept first byte by clearing ACK */ |
@@ -2418,7 +2419,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { | |||
2418 | default: | 2419 | default: |
2419 | if (!tmp) { | 2420 | if (!tmp) { |
2420 | printk("scsi%d: rejecting message ", instance->host_no); | 2421 | printk("scsi%d: rejecting message ", instance->host_no); |
2421 | print_msg(extended_msg); | 2422 | scsi_print_msg(extended_msg); |
2422 | printk("\n"); | 2423 | printk("\n"); |
2423 | } else if (tmp != EXTENDED_MESSAGE) | 2424 | } else if (tmp != EXTENDED_MESSAGE) |
2424 | printk("scsi%d: rejecting unknown message %02x from target %d, lun %d\n", instance->host_no, tmp, cmd->device->id, cmd->device->lun); | 2425 | printk("scsi%d: rejecting unknown message %02x from target %d, lun %d\n", instance->host_no, tmp, cmd->device->id, cmd->device->lun); |
@@ -2552,7 +2553,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { | |||
2552 | 2553 | ||
2553 | if (!(msg[0] & 0x80)) { | 2554 | if (!(msg[0] & 0x80)) { |
2554 | printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no); | 2555 | printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no); |
2555 | print_msg(msg); | 2556 | scsi_print_msg(msg); |
2556 | abort = 1; | 2557 | abort = 1; |
2557 | } else { | 2558 | } else { |
2558 | /* Accept message by clearing ACK */ | 2559 | /* Accept message by clearing ACK */ |
@@ -2677,7 +2678,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) { | |||
2677 | Scsi_Cmnd *tmp, **prev; | 2678 | Scsi_Cmnd *tmp, **prev; |
2678 | 2679 | ||
2679 | printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no); | 2680 | printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no); |
2680 | print_Scsi_Cmnd(cmd); | 2681 | scsi_print_command(cmd); |
2681 | 2682 | ||
2682 | NCR5380_print_status(instance); | 2683 | NCR5380_print_status(instance); |
2683 | 2684 | ||