diff options
author | <hch@lst.de> | 2005-04-03 15:53:59 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-18 13:32:20 -0400 |
commit | db9dff366ba78085d0323364fadbf09bec0e77ee (patch) | |
tree | ae86a60cf83c3d897f9488e90fca4b36cd545a1a /drivers/scsi/arm | |
parent | b6651129cc27d56a9cbefcb5f713cea7706fd6b7 (diff) |
[PATCH] remove outdated print_* functions
We have the scsi_print_* functions in the proper namespace for a long
time now and there weren't a lot users left.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/arm')
-rw-r--r-- | drivers/scsi/arm/acornscsi.c | 9 | ||||
-rw-r--r-- | drivers/scsi/arm/fas216.c | 9 | ||||
-rw-r--r-- | drivers/scsi/arm/scsi.h | 2 |
3 files changed, 11 insertions, 9 deletions
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 | ||
315 | static void | 316 | static 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 | } |