aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/atari_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/atari_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/atari_NCR5380.c')
-rw-r--r--drivers/scsi/atari_NCR5380.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 2ae31ceb32a8..57295bcea3e7 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -74,6 +74,7 @@
74 * the high level code. 74 * the high level code.
75 */ 75 */
76#include <scsi/scsi_dbg.h> 76#include <scsi/scsi_dbg.h>
77#include <scsi/scsi_transport_spi.h>
77 78
78#if (NDEBUG & NDEBUG_LISTS) 79#if (NDEBUG & NDEBUG_LISTS)
79#define LIST(x,y) \ 80#define LIST(x,y) \
@@ -2355,7 +2356,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
2355 * 3..length+1 arguments 2356 * 3..length+1 arguments
2356 * 2357 *
2357 * Start the extended message buffer with the EXTENDED_MESSAGE 2358 * Start the extended message buffer with the EXTENDED_MESSAGE
2358 * byte, since scsi_print_msg() wants the whole thing. 2359 * byte, since spi_print_msg() wants the whole thing.
2359 */ 2360 */
2360 extended_msg[0] = EXTENDED_MESSAGE; 2361 extended_msg[0] = EXTENDED_MESSAGE;
2361 /* Accept first byte by clearing ACK */ 2362 /* Accept first byte by clearing ACK */
@@ -2408,7 +2409,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
2408 default: 2409 default:
2409 if (!tmp) { 2410 if (!tmp) {
2410 printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO); 2411 printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
2411 scsi_print_msg (extended_msg); 2412 spi_print_msg(extended_msg);
2412 printk("\n"); 2413 printk("\n");
2413 } else if (tmp != EXTENDED_MESSAGE) 2414 } else if (tmp != EXTENDED_MESSAGE)
2414 printk(KERN_DEBUG "scsi%d: rejecting unknown " 2415 printk(KERN_DEBUG "scsi%d: rejecting unknown "
@@ -2541,7 +2542,7 @@ static void NCR5380_reselect (struct Scsi_Host *instance)
2541 2542
2542 if (!(msg[0] & 0x80)) { 2543 if (!(msg[0] & 0x80)) {
2543 printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); 2544 printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
2544 scsi_print_msg(msg); 2545 spi_print_msg(msg);
2545 do_abort(instance); 2546 do_abort(instance);
2546 return; 2547 return;
2547 } 2548 }