aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/NCR5380.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2005-12-15 16:22:01 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2005-12-15 21:41:27 -0500
commit1abfd370134553f3b47e3e40a0526e05001409c2 (patch)
tree44653f5df309634cfdf347dcf1ec961667721101 /drivers/scsi/NCR5380.c
parent410ca5c7c6ed08bda165e8137bff26c3fbee5a1b (diff)
[SCSI] Rename scsi_print_msg to spi_print_msg
Rename scsi_print_msg to spi_print_msg and move its prototype from scsi_dbg.h to scsi_transport_spi.h Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
-rw-r--r--drivers/scsi/NCR5380.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index cba9655d0f1..9f0ddbe6dc7 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -87,6 +87,7 @@
87 * the high level code. 87 * the high level code.
88 */ 88 */
89#include <scsi/scsi_dbg.h> 89#include <scsi/scsi_dbg.h>
90#include <scsi/scsi_transport_spi.h>
90 91
91#ifndef NDEBUG 92#ifndef NDEBUG
92#define NDEBUG 0 93#define NDEBUG 0
@@ -2377,7 +2378,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
2377 * 3..length+1 arguments 2378 * 3..length+1 arguments
2378 * 2379 *
2379 * Start the extended message buffer with the EXTENDED_MESSAGE 2380 * Start the extended message buffer with the EXTENDED_MESSAGE
2380 * byte, since scsi_print_msg() wants the whole thing. 2381 * byte, since spi_print_msg() wants the whole thing.
2381 */ 2382 */
2382 extended_msg[0] = EXTENDED_MESSAGE; 2383 extended_msg[0] = EXTENDED_MESSAGE;
2383 /* Accept first byte by clearing ACK */ 2384 /* Accept first byte by clearing ACK */
@@ -2424,7 +2425,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
2424 default: 2425 default:
2425 if (!tmp) { 2426 if (!tmp) {
2426 printk("scsi%d: rejecting message ", instance->host_no); 2427 printk("scsi%d: rejecting message ", instance->host_no);
2427 scsi_print_msg(extended_msg); 2428 spi_print_msg(extended_msg);
2428 printk("\n"); 2429 printk("\n");
2429 } else if (tmp != EXTENDED_MESSAGE) 2430 } else if (tmp != EXTENDED_MESSAGE)
2430 scmd_printk(KERN_INFO, cmd, 2431 scmd_printk(KERN_INFO, cmd,
@@ -2560,7 +2561,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
2560 2561
2561 if (!(msg[0] & 0x80)) { 2562 if (!(msg[0] & 0x80)) {
2562 printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no); 2563 printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no);
2563 scsi_print_msg(msg); 2564 spi_print_msg(msg);
2564 abort = 1; 2565 abort = 1;
2565 } else { 2566 } else {
2566 /* Accept message by clearing ACK */ 2567 /* Accept message by clearing ACK */