aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/53c7xx.c
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-03 15:53:59 -0400
committerJames Bottomley <jejb@titanic>2005-04-18 13:32:20 -0400
commitdb9dff366ba78085d0323364fadbf09bec0e77ee (patch)
treeae86a60cf83c3d897f9488e90fca4b36cd545a1a /drivers/scsi/53c7xx.c
parentb6651129cc27d56a9cbefcb5f713cea7706fd6b7 (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/53c7xx.c')
-rw-r--r--drivers/scsi/53c7xx.c23
1 files changed, 12 insertions, 11 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 }