diff options
| author | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
| commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
| tree | 284912295d46a861930d0619788a650f56c2a29b /drivers/scsi/sun3_NCR5380.c | |
| parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
| parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) | |
| download | op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.zip op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.tar.gz | |
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/scsi/sun3_NCR5380.c')
| -rw-r--r-- | drivers/scsi/sun3_NCR5380.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c index 9081139..7e19589 100644 --- a/drivers/scsi/sun3_NCR5380.c +++ b/drivers/scsi/sun3_NCR5380.c @@ -69,6 +69,7 @@ * finally replaced that by the *_PRINTK() macros. * */ +#include <scsi/scsi_dbg.h> /* * Further development / testing that should be done : @@ -2377,7 +2378,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance) * 3..length+1 arguments * * Start the extended message buffer with the EXTENDED_MESSAGE - * byte, since print_msg() wants the whole thing. + * byte, since scsi_print_msg() wants the whole thing. */ extended_msg[0] = EXTENDED_MESSAGE; /* Accept first byte by clearing ACK */ @@ -2430,7 +2431,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance) default: if (!tmp) { printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO); - print_msg (extended_msg); + scsi_print_msg (extended_msg); printk("\n"); } else if (tmp != EXTENDED_MESSAGE) printk(KERN_DEBUG "scsi%d: rejecting unknown " @@ -2565,7 +2566,7 @@ static void NCR5380_reselect (struct Scsi_Host *instance) if (!(msg[0] & 0x80)) { printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); - print_msg(msg); + scsi_print_msg(msg); do_abort(instance); return; } @@ -2691,7 +2692,7 @@ static int NCR5380_abort (Scsi_Cmnd *cmd) unsigned long flags; printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO); - print_Scsi_Cmnd (cmd); + scsi_print_command(cmd); NCR5380_print_status (instance); |
