aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/53c7xx.c23
-rw-r--r--drivers/scsi/NCR5380.c9
-rw-r--r--drivers/scsi/aha152x.c17
-rw-r--r--drivers/scsi/arm/acornscsi.c9
-rw-r--r--drivers/scsi/arm/fas216.c9
-rw-r--r--drivers/scsi/arm/scsi.h2
-rw-r--r--drivers/scsi/atari_NCR5380.c9
-rw-r--r--drivers/scsi/constants.c2
-rw-r--r--drivers/scsi/scsi.c2
-rw-r--r--drivers/scsi/scsi.h37
-rw-r--r--drivers/scsi/seagate.c5
-rw-r--r--drivers/scsi/sg.c3
-rw-r--r--drivers/scsi/sun3_NCR5380.c9
13 files changed, 54 insertions, 82 deletions
diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c
index 8ead55f75d02..2341d27ceed7 100644
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
@@ -280,6 +280,7 @@
280#endif 280#endif
281 281
282#include "scsi.h" 282#include "scsi.h"
283#include <scsi/scsi_dbg.h>
283#include <scsi/scsi_host.h> 284#include <scsi/scsi_host.h>
284#include "53c7xx.h" 285#include "53c7xx.h"
285#include <linux/stat.h> 286#include <linux/stat.h>
@@ -1721,9 +1722,9 @@ NCR53c7xx_run_tests (struct Scsi_Host *host) {
1721 printk ("scsi%d : test 2 INQUIRY to target %d, lun 0 : %s\n", 1722 printk ("scsi%d : test 2 INQUIRY to target %d, lun 0 : %s\n",
1722 host->host_no, i, data + 8); 1723 host->host_no, i, data + 8);
1723 printk ("scsi%d : status ", host->host_no); 1724 printk ("scsi%d : status ", host->host_no);
1724 print_status (status); 1725 scsi_print_status (status);
1725 printk ("\nscsi%d : message ", host->host_no); 1726 printk ("\nscsi%d : message ", host->host_no);
1726 print_msg (&msg); 1727 scsi_print_msg (&msg);
1727 printk ("\n"); 1728 printk ("\n");
1728 } else if (hostdata->test_completed == 3) { 1729 } else if (hostdata->test_completed == 3) {
1729 printk("scsi%d : test 2 no connection with target %d\n", 1730 printk("scsi%d : test 2 no connection with target %d\n",
@@ -2312,7 +2313,7 @@ NCR53c7x0_dstat_sir_intr (struct Scsi_Host *host, struct
2312 printk ("scsi%d : received message", host->host_no); 2313 printk ("scsi%d : received message", host->host_no);
2313 if (c) 2314 if (c)
2314 printk (" from target %d lun %d ", c->device->id, c->device->lun); 2315 printk (" from target %d lun %d ", c->device->id, c->device->lun);
2315 print_msg ((unsigned char *) hostdata->msg_buf); 2316 scsi_print_msg ((unsigned char *) hostdata->msg_buf);
2316 printk("\n"); 2317 printk("\n");
2317 } 2318 }
2318 2319
@@ -3204,7 +3205,7 @@ create_cmd (Scsi_Cmnd *cmd) {
3204 case WRITE_10: 3205 case WRITE_10:
3205#if 0 3206#if 0
3206 printk("scsi%d : command is ", host->host_no); 3207 printk("scsi%d : command is ", host->host_no);
3207 print_command(cmd->cmnd); 3208 __scsi_print_command(cmd->cmnd);
3208#endif 3209#endif
3209#if 0 3210#if 0
3210 printk ("scsi%d : %d scatter/gather segments\n", host->host_no, 3211 printk ("scsi%d : %d scatter/gather segments\n", host->host_no,
@@ -3232,7 +3233,7 @@ create_cmd (Scsi_Cmnd *cmd) {
3232 */ 3233 */
3233 default: 3234 default:
3234 printk("scsi%d : datain+dataout for command ", host->host_no); 3235 printk("scsi%d : datain+dataout for command ", host->host_no);
3235 print_command(cmd->cmnd); 3236 __scsi_print_command(cmd->cmnd);
3236 datain = dataout = 2 * (cmd->use_sg ? cmd->use_sg : 1) + 3; 3237 datain = dataout = 2 * (cmd->use_sg ? cmd->use_sg : 1) + 3;
3237 } 3238 }
3238 3239
@@ -3938,7 +3939,7 @@ intr_scsi (struct Scsi_Host *host, struct NCR53c7x0_cmd *cmd) {
3938 if (cmd) { 3939 if (cmd) {
3939 printk("scsi%d : target %d, lun %d, command ", 3940 printk("scsi%d : target %d, lun %d, command ",
3940 host->host_no, cmd->cmd->device->id, cmd->cmd->device->lun); 3941 host->host_no, cmd->cmd->device->id, cmd->cmd->device->lun);
3941 print_command (cmd->cmd->cmnd); 3942 __scsi_print_command (cmd->cmd->cmnd);
3942 printk("scsi%d : dsp = 0x%x (virt 0x%p)\n", host->host_no, 3943 printk("scsi%d : dsp = 0x%x (virt 0x%p)\n", host->host_no,
3943 NCR53c7x0_read32(DSP_REG), 3944 NCR53c7x0_read32(DSP_REG),
3944 bus_to_virt(NCR53c7x0_read32(DSP_REG))); 3945 bus_to_virt(NCR53c7x0_read32(DSP_REG)));
@@ -4208,7 +4209,7 @@ restart:
4208 if (hostdata->options & OPTION_DEBUG_INTR) { 4209 if (hostdata->options & OPTION_DEBUG_INTR) {
4209 printk ("scsi%d : command complete : pid %lu, id %d,lun %d result 0x%x ", 4210 printk ("scsi%d : command complete : pid %lu, id %d,lun %d result 0x%x ",
4210 host->host_no, tmp->pid, tmp->device->id, tmp->device->lun, tmp->result); 4211 host->host_no, tmp->pid, tmp->device->id, tmp->device->lun, tmp->result);
4211 print_command (tmp->cmnd); 4212 __scsi_print_command (tmp->cmnd);
4212 } 4213 }
4213 4214
4214 tmp->scsi_done(tmp); 4215 tmp->scsi_done(tmp);
@@ -4297,7 +4298,7 @@ NCR53c7x0_intr (int irq, void *dev_id, struct pt_regs * regs)
4297 printk("scsi%d : interrupt for pid %lu, id %d, lun %d ", 4298 printk("scsi%d : interrupt for pid %lu, id %d, lun %d ",
4298 host->host_no, cmd->cmd->pid, (int) cmd->cmd->device->id, 4299 host->host_no, cmd->cmd->pid, (int) cmd->cmd->device->id,
4299 (int) cmd->cmd->device->lun); 4300 (int) cmd->cmd->device->lun);
4300 print_command (cmd->cmd->cmnd); 4301 __scsi_print_command (cmd->cmd->cmnd);
4301 } else { 4302 } else {
4302 printk("scsi%d : no active command\n", host->host_no); 4303 printk("scsi%d : no active command\n", host->host_no);
4303 } 4304 }
@@ -5539,7 +5540,7 @@ print_dsa (struct Scsi_Host *host, u32 *dsa, const char *prefix) {
5539 i > 0 && !check_address ((unsigned long) ptr, 1); 5540 i > 0 && !check_address ((unsigned long) ptr, 1);
5540 ptr += len, i -= len) { 5541 ptr += len, i -= len) {
5541 printk(" "); 5542 printk(" ");
5542 len = print_msg (ptr); 5543 len = scsi_print_msg (ptr);
5543 printk("\n"); 5544 printk("\n");
5544 if (!len) 5545 if (!len)
5545 break; 5546 break;
@@ -5554,7 +5555,7 @@ print_dsa (struct Scsi_Host *host, u32 *dsa, const char *prefix) {
5554 if (cmd) { 5555 if (cmd) {
5555 printk(" result = 0x%x, target = %d, lun = %d, cmd = ", 5556 printk(" result = 0x%x, target = %d, lun = %d, cmd = ",
5556 cmd->result, cmd->device->id, cmd->device->lun); 5557 cmd->result, cmd->device->id, cmd->device->lun);
5557 print_command(cmd->cmnd); 5558 __scsi_print_command(cmd->cmnd);
5558 } else 5559 } else
5559 printk("\n"); 5560 printk("\n");
5560 printk(" + %d : dsa_next = 0x%x\n", hostdata->dsa_next, 5561 printk(" + %d : dsa_next = 0x%x\n", hostdata->dsa_next,
@@ -6028,7 +6029,7 @@ dump_events (struct Scsi_Host *host, int count) {
6028 virt_to_bus(event.dsa), event.dsa); 6029 virt_to_bus(event.dsa), event.dsa);
6029 if (event.pid != -1) { 6030 if (event.pid != -1) {
6030 printk (" event for pid %ld ", event.pid); 6031 printk (" event for pid %ld ", event.pid);
6031 print_command (event.cmnd); 6032 __scsi_print_command (event.cmnd);
6032 } 6033 }
6033 } 6034 }
6034 } 6035 }
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
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index d7b8efe86401..88d119f4b970 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -257,6 +257,7 @@
257#include <scsi/scsicam.h> 257#include <scsi/scsicam.h>
258 258
259#include "scsi.h" 259#include "scsi.h"
260#include <scsi/scsi_dbg.h>
260#include <scsi/scsi_host.h> 261#include <scsi/scsi_host.h>
261#include "aha152x.h" 262#include "aha152x.h"
262 263
@@ -986,7 +987,7 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct semaphore *sem, int p
986 if (HOSTDATA(shpnt)->debug & debug_queue) { 987 if (HOSTDATA(shpnt)->debug & debug_queue) {
987 printk(INFO_LEAD "queue: %p; cmd_len=%d pieces=%d size=%u cmnd=", 988 printk(INFO_LEAD "queue: %p; cmd_len=%d pieces=%d size=%u cmnd=",
988 CMDINFO(SCpnt), SCpnt, SCpnt->cmd_len, SCpnt->use_sg, SCpnt->request_bufflen); 989 CMDINFO(SCpnt), SCpnt, SCpnt->cmd_len, SCpnt->use_sg, SCpnt->request_bufflen);
989 print_command(SCpnt->cmnd); 990 __scsi_print_command(SCpnt->cmnd);
990 } 991 }
991#endif 992#endif
992 993
@@ -1560,7 +1561,7 @@ static void busfree_run(struct Scsi_Host *shpnt)
1560#if 0 1561#if 0
1561 if(HOSTDATA(shpnt)->debug & debug_eh) { 1562 if(HOSTDATA(shpnt)->debug & debug_eh) {
1562 printk(ERR_LEAD "received sense: ", CMDINFO(DONE_SC)); 1563 printk(ERR_LEAD "received sense: ", CMDINFO(DONE_SC));
1563 print_sense("bh", DONE_SC); 1564 scsi_print_sense("bh", DONE_SC);
1564 } 1565 }
1565#endif 1566#endif
1566 1567
@@ -1846,7 +1847,7 @@ static void msgi_run(struct Scsi_Host *shpnt)
1846#if defined(AHA152X_DEBUG) 1847#if defined(AHA152X_DEBUG)
1847 if (HOSTDATA(shpnt)->debug & debug_msgi) { 1848 if (HOSTDATA(shpnt)->debug & debug_msgi) {
1848 printk(INFO_LEAD "inbound message %02x ", CMDINFO(CURRENT_SC), MSGI(0)); 1849 printk(INFO_LEAD "inbound message %02x ", CMDINFO(CURRENT_SC), MSGI(0));
1849 print_msg(&MSGI(0)); 1850 scsi_print_msg(&MSGI(0));
1850 printk("\n"); 1851 printk("\n");
1851 } 1852 }
1852#endif 1853#endif
@@ -1934,7 +1935,7 @@ static void msgi_run(struct Scsi_Host *shpnt)
1934 break; 1935 break;
1935 1936
1936 printk(INFO_LEAD, CMDINFO(CURRENT_SC)); 1937 printk(INFO_LEAD, CMDINFO(CURRENT_SC));
1937 print_msg(&MSGI(0)); 1938 scsi_print_msg(&MSGI(0));
1938 printk("\n"); 1939 printk("\n");
1939 1940
1940 ticks = (MSGI(3) * 4 + 49) / 50; 1941 ticks = (MSGI(3) * 4 + 49) / 50;
@@ -2032,7 +2033,7 @@ static void msgo_init(struct Scsi_Host *shpnt)
2032 int i; 2033 int i;
2033 2034
2034 printk(DEBUG_LEAD "messages( ", CMDINFO(CURRENT_SC)); 2035 printk(DEBUG_LEAD "messages( ", CMDINFO(CURRENT_SC));
2035 for (i=0; i<MSGOLEN; i+=print_msg(&MSGO(i)), printk(" ")) 2036 for (i=0; i<MSGOLEN; i+=scsi_print_msg(&MSGO(i)), printk(" "))
2036 ; 2037 ;
2037 printk(")\n"); 2038 printk(")\n");
2038 } 2039 }
@@ -2104,7 +2105,7 @@ static void cmd_init(struct Scsi_Host *shpnt)
2104#if defined(AHA152X_DEBUG) 2105#if defined(AHA152X_DEBUG)
2105 if (HOSTDATA(shpnt)->debug & debug_cmd) { 2106 if (HOSTDATA(shpnt)->debug & debug_cmd) {
2106 printk(DEBUG_LEAD "cmd_init: ", CMDINFO(CURRENT_SC)); 2107 printk(DEBUG_LEAD "cmd_init: ", CMDINFO(CURRENT_SC));
2107 print_command(CURRENT_SC->cmnd); 2108 __scsi_print_command(CURRENT_SC->cmnd);
2108 } 2109 }
2109#endif 2110#endif
2110 2111
@@ -2158,7 +2159,7 @@ static void status_run(struct Scsi_Host *shpnt)
2158#if defined(AHA152X_DEBUG) 2159#if defined(AHA152X_DEBUG)
2159 if (HOSTDATA(shpnt)->debug & debug_status) { 2160 if (HOSTDATA(shpnt)->debug & debug_status) {
2160 printk(DEBUG_LEAD "inbound status %02x ", CMDINFO(CURRENT_SC), CURRENT_SC->SCp.Status); 2161 printk(DEBUG_LEAD "inbound status %02x ", CMDINFO(CURRENT_SC), CURRENT_SC->SCp.Status);
2161 print_status(CURRENT_SC->SCp.Status); 2162 scsi_print_status(CURRENT_SC->SCp.Status);
2162 printk("\n"); 2163 printk("\n");
2163 } 2164 }
2164#endif 2165#endif
@@ -2925,7 +2926,7 @@ static void show_command(Scsi_Cmnd *ptr)
2925 printk(KERN_DEBUG "0x%08x: target=%d; lun=%d; cmnd=(", 2926 printk(KERN_DEBUG "0x%08x: target=%d; lun=%d; cmnd=(",
2926 (unsigned int) ptr, ptr->device->id, ptr->device->lun); 2927 (unsigned int) ptr, ptr->device->id, ptr->device->lun);
2927 2928
2928 print_command(ptr->cmnd); 2929 __scsi_print_command(ptr->cmnd);
2929 2930
2930 printk(KERN_DEBUG "); request_bufflen=%d; resid=%d; phase |", 2931 printk(KERN_DEBUG "); request_bufflen=%d; resid=%d; phase |",
2931 ptr->request_bufflen, ptr->resid); 2932 ptr->request_bufflen, ptr->resid);
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 24dd0b890dd2..be2caecbbdd9 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -150,6 +150,7 @@
150#include <asm/ecard.h> 150#include <asm/ecard.h>
151 151
152#include "../scsi.h" 152#include "../scsi.h"
153#include <scsi/scsi_dbg.h>
153#include <scsi/scsi_host.h> 154#include <scsi/scsi_host.h>
154#include "acornscsi.h" 155#include "acornscsi.h"
155#include "msgqueue.h" 156#include "msgqueue.h"
@@ -866,7 +867,7 @@ void acornscsi_done(AS_Host *host, Scsi_Cmnd **SCpntp, unsigned int result)
866 default: 867 default:
867 printk(KERN_ERR "scsi%d.H: incomplete data transfer detected: result=%08X command=", 868 printk(KERN_ERR "scsi%d.H: incomplete data transfer detected: result=%08X command=",
868 host->host->host_no, SCpnt->result); 869 host->host->host_no, SCpnt->result);
869 print_command(SCpnt->cmnd); 870 __scsi_print_command(SCpnt->cmnd);
870 acornscsi_dumpdma(host, "done"); 871 acornscsi_dumpdma(host, "done");
871 acornscsi_dumplog(host, SCpnt->device->id); 872 acornscsi_dumplog(host, SCpnt->device->id);
872 SCpnt->result &= 0xffff; 873 SCpnt->result &= 0xffff;
@@ -1369,7 +1370,7 @@ void acornscsi_sendmessage(AS_Host *host)
1369 1370
1370 host->scsi.last_message = msg->msg[0]; 1371 host->scsi.last_message = msg->msg[0];
1371#if (DEBUG & DEBUG_MESSAGES) 1372#if (DEBUG & DEBUG_MESSAGES)
1372 print_msg(msg->msg); 1373 scsi_print_msg(msg->msg);
1373#endif 1374#endif
1374 break; 1375 break;
1375 1376
@@ -1391,7 +1392,7 @@ void acornscsi_sendmessage(AS_Host *host)
1391 while ((msg = msgqueue_getmsg(&host->scsi.msgs, msgnr++)) != NULL) { 1392 while ((msg = msgqueue_getmsg(&host->scsi.msgs, msgnr++)) != NULL) {
1392 unsigned int i; 1393 unsigned int i;
1393#if (DEBUG & DEBUG_MESSAGES) 1394#if (DEBUG & DEBUG_MESSAGES)
1394 print_msg(msg); 1395 scsi_print_msg(msg);
1395#endif 1396#endif
1396 i = 0; 1397 i = 0;
1397 if (acornscsi_write_pio(host, msg->msg, &i, msg->length, 1000000)) 1398 if (acornscsi_write_pio(host, msg->msg, &i, msg->length, 1000000))
@@ -1487,7 +1488,7 @@ void acornscsi_message(AS_Host *host)
1487#if (DEBUG & DEBUG_MESSAGES) 1488#if (DEBUG & DEBUG_MESSAGES)
1488 printk("scsi%d.%c: message in: ", 1489 printk("scsi%d.%c: message in: ",
1489 host->host->host_no, acornscsi_target(host)); 1490 host->host->host_no, acornscsi_target(host));
1490 print_msg(message); 1491 scsi_print_msg(message);
1491 printk("\n"); 1492 printk("\n");
1492#endif 1493#endif
1493 1494
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 5411e850c833..0a172c1e9f7e 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -52,6 +52,7 @@
52#include <asm/ecard.h> 52#include <asm/ecard.h>
53 53
54#include "../scsi.h" 54#include "../scsi.h"
55#include <scsi/scsi_dbg.h>
55#include <scsi/scsi_host.h> 56#include <scsi/scsi_host.h>
56#include "fas216.h" 57#include "fas216.h"
57#include "scsi.h" 58#include "scsi.h"
@@ -309,7 +310,7 @@ fas216_log_command(FAS216_Info *info, int level, Scsi_Cmnd *SCpnt, char *fmt, ..
309 va_end(args); 310 va_end(args);
310 311
311 printk(" CDB: "); 312 printk(" CDB: ");
312 print_command(SCpnt->cmnd); 313 __scsi_print_command(SCpnt->cmnd);
313} 314}
314 315
315static void 316static void
@@ -2081,7 +2082,7 @@ fas216_std_done(FAS216_Info *info, Scsi_Cmnd *SCpnt, unsigned int result)
2081 info->host->host_no, '0' + SCpnt->device->id, 2082 info->host->host_no, '0' + SCpnt->device->id,
2082 SCpnt->result, info->scsi.SCp.ptr, 2083 SCpnt->result, info->scsi.SCp.ptr,
2083 info->scsi.SCp.this_residual); 2084 info->scsi.SCp.this_residual);
2084 print_command(SCpnt->cmnd); 2085 __scsi_print_command(SCpnt->cmnd);
2085 SCpnt->result &= ~(255 << 16); 2086 SCpnt->result &= ~(255 << 16);
2086 SCpnt->result |= DID_BAD_TARGET << 16; 2087 SCpnt->result |= DID_BAD_TARGET << 16;
2087 goto request_sense; 2088 goto request_sense;
@@ -2170,7 +2171,7 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
2170 info->host->host_no, '0' + SCpnt->device->id, 2171 info->host->host_no, '0' + SCpnt->device->id,
2171 info->scsi.SCp.ptr, info->scsi.SCp.this_residual); 2172 info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
2172 info->scsi.SCp.ptr = NULL; 2173 info->scsi.SCp.ptr = NULL;
2173 print_command(SCpnt->cmnd); 2174 __scsi_print_command(SCpnt->cmnd);
2174 } 2175 }
2175 2176
2176 /* 2177 /*
@@ -2426,7 +2427,7 @@ int fas216_eh_abort(Scsi_Cmnd *SCpnt)
2426 info->stats.aborts += 1; 2427 info->stats.aborts += 1;
2427 2428
2428 printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no); 2429 printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no);
2429 print_command(SCpnt->data_cmnd); 2430 __scsi_print_command(SCpnt->data_cmnd);
2430 2431
2431 print_debug_list(); 2432 print_debug_list();
2432 fas216_dumpstate(info); 2433 fas216_dumpstate(info);
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
index 2f1b3f4bf954..48e1c4d9738b 100644
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
@@ -108,7 +108,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt)
108#if 0 //def BELT_AND_BRACES 108#if 0 //def BELT_AND_BRACES
109 printk(KERN_WARNING "scsi%d.%c: zero length buffer passed for " 109 printk(KERN_WARNING "scsi%d.%c: zero length buffer passed for "
110 "command ", SCpnt->host->host_no, '0' + SCpnt->target); 110 "command ", SCpnt->host->host_no, '0' + SCpnt->target);
111 print_command(SCpnt->cmnd); 111 __scsi_print_command(SCpnt->cmnd);
112#endif 112#endif
113 SCpnt->SCp.ptr = NULL; 113 SCpnt->SCp.ptr = NULL;
114 } 114 }
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 5d1e78ebed83..2c12be72c4c6 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -73,6 +73,7 @@
73 * 1. Test linked command handling code after Eric is ready with 73 * 1. Test linked command handling code after Eric is ready with
74 * the high level code. 74 * the high level code.
75 */ 75 */
76#include <scsi/scsi_dbg.h>
76 77
77#if (NDEBUG & NDEBUG_LISTS) 78#if (NDEBUG & NDEBUG_LISTS)
78#define LIST(x,y) \ 79#define LIST(x,y) \
@@ -2354,7 +2355,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
2354 * 3..length+1 arguments 2355 * 3..length+1 arguments
2355 * 2356 *
2356 * Start the extended message buffer with the EXTENDED_MESSAGE 2357 * Start the extended message buffer with the EXTENDED_MESSAGE
2357 * byte, since print_msg() wants the whole thing. 2358 * byte, since scsi_print_msg() wants the whole thing.
2358 */ 2359 */
2359 extended_msg[0] = EXTENDED_MESSAGE; 2360 extended_msg[0] = EXTENDED_MESSAGE;
2360 /* Accept first byte by clearing ACK */ 2361 /* Accept first byte by clearing ACK */
@@ -2407,7 +2408,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
2407 default: 2408 default:
2408 if (!tmp) { 2409 if (!tmp) {
2409 printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO); 2410 printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
2410 print_msg (extended_msg); 2411 scsi_print_msg (extended_msg);
2411 printk("\n"); 2412 printk("\n");
2412 } else if (tmp != EXTENDED_MESSAGE) 2413 } else if (tmp != EXTENDED_MESSAGE)
2413 printk(KERN_DEBUG "scsi%d: rejecting unknown " 2414 printk(KERN_DEBUG "scsi%d: rejecting unknown "
@@ -2540,7 +2541,7 @@ static void NCR5380_reselect (struct Scsi_Host *instance)
2540 2541
2541 if (!(msg[0] & 0x80)) { 2542 if (!(msg[0] & 0x80)) {
2542 printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); 2543 printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
2543 print_msg(msg); 2544 scsi_print_msg(msg);
2544 do_abort(instance); 2545 do_abort(instance);
2545 return; 2546 return;
2546 } 2547 }
@@ -2646,7 +2647,7 @@ int NCR5380_abort (Scsi_Cmnd *cmd)
2646 unsigned long flags; 2647 unsigned long flags;
2647 2648
2648 printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO); 2649 printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);
2649 print_Scsi_Cmnd (cmd); 2650 scsi_print_command(cmd);
2650 2651
2651 NCR5380_print_status (instance); 2652 NCR5380_print_status (instance);
2652 2653
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index d625fdebe052..ec161733a82b 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -372,7 +372,7 @@ static void scsi_print_cdb(unsigned char *cdb, int cdb_len, int start_of_line)
372 372
373/** 373/**
374 * 374 *
375 * print_status - print scsi status description 375 * scsi_print_status - print scsi status description
376 * @scsi_status: scsi status value 376 * @scsi_status: scsi status value
377 * 377 *
378 * If the status is recognized, the description is printed. 378 * If the status is recognized, the description is printed.
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 2e7ab3ab0993..5dc84669616d 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -489,7 +489,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
489 scsi_print_command(cmd); 489 scsi_print_command(cmd);
490 if (status_byte(cmd->result) & CHECK_CONDITION) { 490 if (status_byte(cmd->result) & CHECK_CONDITION) {
491 /* 491 /*
492 * XXX The print_sense formatting/prefix 492 * XXX The scsi_print_sense formatting/prefix
493 * doesn't match this function. 493 * doesn't match this function.
494 */ 494 */
495 scsi_print_sense("", cmd); 495 scsi_print_sense("", cmd);
diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h
index cb6b5fbb7e14..6e7bb068220f 100644
--- a/drivers/scsi/scsi.h
+++ b/drivers/scsi/scsi.h
@@ -23,7 +23,6 @@
23#include <linux/config.h> /* for CONFIG_SCSI_LOGGING */ 23#include <linux/config.h> /* for CONFIG_SCSI_LOGGING */
24 24
25#include <scsi/scsi_cmnd.h> 25#include <scsi/scsi_cmnd.h>
26#include <scsi/scsi_dbg.h>
27#include <scsi/scsi_device.h> 26#include <scsi/scsi_device.h>
28#include <scsi/scsi_eh.h> 27#include <scsi/scsi_eh.h>
29#include <scsi/scsi_request.h> 28#include <scsi/scsi_request.h>
@@ -62,42 +61,6 @@ struct scatterlist;
62#define scsi_to_sbus_dma_dir(scsi_dir) ((int)(scsi_dir)) 61#define scsi_to_sbus_dma_dir(scsi_dir) ((int)(scsi_dir))
63 62
64/* 63/*
65 * Old names for debug prettyprinting functions.
66 */
67static inline void print_Scsi_Cmnd(struct scsi_cmnd *cmd)
68{
69 return scsi_print_command(cmd);
70}
71static inline void print_command(unsigned char *cdb)
72{
73 return __scsi_print_command(cdb);
74}
75static inline void print_sense(const char *devclass, struct scsi_cmnd *cmd)
76{
77 return scsi_print_sense(devclass, cmd);
78}
79static inline void print_req_sense(const char *devclass, struct scsi_request *req)
80{
81 return scsi_print_req_sense(devclass, req);
82}
83static inline void print_driverbyte(int scsiresult)
84{
85 return scsi_print_driverbyte(scsiresult);
86}
87static inline void print_hostbyte(int scsiresult)
88{
89 return scsi_print_hostbyte(scsiresult);
90}
91static inline void print_status(unsigned char status)
92{
93 return scsi_print_status(status);
94}
95static inline int print_msg(const unsigned char *msg)
96{
97 return scsi_print_msg(msg);
98}
99
100/*
101 * This is the crap from the old error handling code. We have it in a special 64 * This is the crap from the old error handling code. We have it in a special
102 * place so that we can more easily delete it later on. 65 * place so that we can more easily delete it later on.
103 */ 66 */
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index b362ff2811da..4c95abb54057 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -103,6 +103,7 @@
103#include <asm/uaccess.h> 103#include <asm/uaccess.h>
104 104
105#include "scsi.h" 105#include "scsi.h"
106#include <scsi/scsi_dbg.h>
106#include <scsi/scsi_host.h> 107#include <scsi/scsi_host.h>
107#include "seagate.h" 108#include "seagate.h"
108 109
@@ -746,7 +747,7 @@ static int internal_command (unsigned char target, unsigned char lun,
746 747
747#if (DEBUG & PRINT_COMMAND) 748#if (DEBUG & PRINT_COMMAND)
748 printk("scsi%d : target = %d, command = ", hostno, target); 749 printk("scsi%d : target = %d, command = ", hostno, target);
749 print_command((unsigned char *) cmnd); 750 __scsi_print_command((unsigned char *) cmnd);
750#endif 751#endif
751 752
752#if (DEBUG & PHASE_RESELECT) 753#if (DEBUG & PHASE_RESELECT)
@@ -1553,7 +1554,7 @@ connect_loop:
1553 printk("\n"); 1554 printk("\n");
1554#endif 1555#endif
1555 printk("scsi%d : status = ", hostno); 1556 printk("scsi%d : status = ", hostno);
1556 print_status(status); 1557 scsi_print_status(status);
1557 printk(" message = %02x\n", message); 1558 printk(" message = %02x\n", message);
1558#endif 1559#endif
1559 1560
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index fd72d73bb244..cf6b1f0fb124 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -51,6 +51,7 @@ static int sg_version_num = 30532; /* 2 digits for each component */
51#include <linux/delay.h> 51#include <linux/delay.h>
52 52
53#include "scsi.h" 53#include "scsi.h"
54#include <scsi/scsi_dbg.h>
54#include <scsi/scsi_host.h> 55#include <scsi/scsi_host.h>
55#include <scsi/scsi_driver.h> 56#include <scsi/scsi_driver.h>
56#include <scsi/scsi_ioctl.h> 57#include <scsi/scsi_ioctl.h>
@@ -1311,7 +1312,7 @@ sg_cmd_done(Scsi_Cmnd * SCpnt)
1311 if ((sdp->sgdebug > 0) && 1312 if ((sdp->sgdebug > 0) &&
1312 ((CHECK_CONDITION == srp->header.masked_status) || 1313 ((CHECK_CONDITION == srp->header.masked_status) ||
1313 (COMMAND_TERMINATED == srp->header.masked_status))) 1314 (COMMAND_TERMINATED == srp->header.masked_status)))
1314 print_req_sense("sg_cmd_done", SRpnt); 1315 scsi_print_req_sense("sg_cmd_done", SRpnt);
1315 1316
1316 /* Following if statement is a patch supplied by Eric Youngdale */ 1317 /* Following if statement is a patch supplied by Eric Youngdale */
1317 if (driver_byte(SRpnt->sr_result) != 0 1318 if (driver_byte(SRpnt->sr_result) != 0
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 90811390a37d..7e19589e71a0 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -69,6 +69,7 @@
69 * finally replaced that by the *_PRINTK() macros. 69 * finally replaced that by the *_PRINTK() macros.
70 * 70 *
71 */ 71 */
72#include <scsi/scsi_dbg.h>
72 73
73/* 74/*
74 * Further development / testing that should be done : 75 * Further development / testing that should be done :
@@ -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 print_msg() wants the whole thing. 2381 * byte, since scsi_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 */
@@ -2430,7 +2431,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
2430 default: 2431 default:
2431 if (!tmp) { 2432 if (!tmp) {
2432 printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO); 2433 printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
2433 print_msg (extended_msg); 2434 scsi_print_msg (extended_msg);
2434 printk("\n"); 2435 printk("\n");
2435 } else if (tmp != EXTENDED_MESSAGE) 2436 } else if (tmp != EXTENDED_MESSAGE)
2436 printk(KERN_DEBUG "scsi%d: rejecting unknown " 2437 printk(KERN_DEBUG "scsi%d: rejecting unknown "
@@ -2565,7 +2566,7 @@ static void NCR5380_reselect (struct Scsi_Host *instance)
2565 2566
2566 if (!(msg[0] & 0x80)) { 2567 if (!(msg[0] & 0x80)) {
2567 printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); 2568 printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
2568 print_msg(msg); 2569 scsi_print_msg(msg);
2569 do_abort(instance); 2570 do_abort(instance);
2570 return; 2571 return;
2571 } 2572 }
@@ -2691,7 +2692,7 @@ static int NCR5380_abort (Scsi_Cmnd *cmd)
2691 unsigned long flags; 2692 unsigned long flags;
2692 2693
2693 printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO); 2694 printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);
2694 print_Scsi_Cmnd (cmd); 2695 scsi_print_command(cmd);
2695 2696
2696 NCR5380_print_status (instance); 2697 NCR5380_print_status (instance);
2697 2698