aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/u14-34f.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-24 18:04:36 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-10-28 22:04:15 -0400
commit017560fca496f72ed9dd734ffde63ce39dfe0411 (patch)
treee63ae9a28fc179e715eda32f12aaec4ca752651b /drivers/scsi/u14-34f.c
parent3bf743e7c891d8be8295650b7a6a9b5af083b096 (diff)
[SCSI] use sfoo_printk() in drivers
Rejections fixed up and Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/u14-34f.c')
-rw-r--r--drivers/scsi/u14-34f.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index b0b6cdf02cbd..e778e17d57f0 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -726,8 +726,7 @@ static int u14_34f_slave_configure(struct scsi_device *dev) {
726 else 726 else
727 link_suffix = ""; 727 link_suffix = "";
728 728
729 printk("%s: scsi%d, channel %d, id %d, lun %d, cmds/lun %d%s%s.\n", 729 sdev_printk(KERN_INFO, dev, "cmds/lun %d%s%s.\n",
730 BN(j), host->host_no, dev->channel, dev->id, dev->lun,
731 dev->queue_depth, link_suffix, tag_suffix); 730 dev->queue_depth, link_suffix, tag_suffix);
732 731
733 return FALSE; 732 return FALSE;
@@ -1319,8 +1318,8 @@ static int u14_34f_queuecommand(struct scsi_cmnd *SCpnt, void (*done)(struct scs
1319 if (wait_on_busy(sh[j]->io_port, MAXLOOP)) { 1318 if (wait_on_busy(sh[j]->io_port, MAXLOOP)) {
1320 unmap_dma(i, j); 1319 unmap_dma(i, j);
1321 SCpnt->host_scribble = NULL; 1320 SCpnt->host_scribble = NULL;
1322 printk("%s: qcomm, target %d.%d:%d, pid %ld, adapter busy.\n", 1321 scmd_printk(KERN_INFO, SCpnt,
1323 BN(j), SCpnt->device->channel, SCpnt->device->id, SCpnt->device->lun, SCpnt->pid); 1322 "qcomm, pid %ld, adapter busy.\n", SCpnt->pid);
1324 return 1; 1323 return 1;
1325 } 1324 }
1326 1325
@@ -1340,14 +1339,14 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) {
1340 j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number; 1339 j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number;
1341 1340
1342 if (SCarg->host_scribble == NULL) { 1341 if (SCarg->host_scribble == NULL) {
1343 printk("%s: abort, target %d.%d:%d, pid %ld inactive.\n", 1342 scmd_printk(KERN_INFO, SCarg, "abort, pid %ld inactive.\n",
1344 BN(j), SCarg->device->channel, SCarg->device->id, SCarg->device->lun, SCarg->pid); 1343 SCarg->pid);
1345 return SUCCESS; 1344 return SUCCESS;
1346 } 1345 }
1347 1346
1348 i = *(unsigned int *)SCarg->host_scribble; 1347 i = *(unsigned int *)SCarg->host_scribble;
1349 printk("%s: abort, mbox %d, target %d.%d:%d, pid %ld.\n", 1348 scmd_printk(KERN_INFO, SCarg, "abort, mbox %d, pid %ld.\n",
1350 BN(j), i, SCarg->device->channel, SCarg->device->id, SCarg->device->lun, SCarg->pid); 1349 i, SCarg->pid);
1351 1350
1352 if (i >= sh[j]->can_queue) 1351 if (i >= sh[j]->can_queue)
1353 panic("%s: abort, invalid SCarg->host_scribble.\n", BN(j)); 1352 panic("%s: abort, invalid SCarg->host_scribble.\n", BN(j));
@@ -1405,8 +1404,7 @@ static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) {
1405 struct scsi_cmnd *SCpnt; 1404 struct scsi_cmnd *SCpnt;
1406 1405
1407 j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number; 1406 j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number;
1408 printk("%s: reset, enter, target %d.%d:%d, pid %ld.\n", 1407 scmd_printk(KERN_INFO, SCarg, "reset, enter, pid %ld.\n", SCarg->pid);
1409 BN(j), SCarg->device->channel, SCarg->device->id, SCarg->device->lun, SCarg->pid);
1410 1408
1411 spin_lock_irq(sh[j]->host_lock); 1409 spin_lock_irq(sh[j]->host_lock);
1412 1410
@@ -1709,9 +1707,10 @@ static void flush_dev(struct scsi_device *dev, unsigned long cursec, unsigned in
1709 k = il[n]; cpp = &HD(j)->cp[k]; SCpnt = cpp->SCpnt; 1707 k = il[n]; cpp = &HD(j)->cp[k]; SCpnt = cpp->SCpnt;
1710 1708
1711 if (wait_on_busy(sh[j]->io_port, MAXLOOP)) { 1709 if (wait_on_busy(sh[j]->io_port, MAXLOOP)) {
1712 printk("%s: %s, target %d.%d:%d, pid %ld, mbox %d, adapter"\ 1710 scmd_printk(KERN_INFO, SCpnt,
1713 " busy, will abort.\n", BN(j), (ihdlr ? "ihdlr" : "qcomm"), 1711 "%s, pid %ld, mbox %d, adapter"
1714 SCpnt->device->channel, SCpnt->device->id, SCpnt->device->lun, SCpnt->pid, k); 1712 " busy, will abort.\n", (ihdlr ? "ihdlr" : "qcomm"),
1713 SCpnt->pid, k);
1715 HD(j)->cp_stat[k] = ABORTING; 1714 HD(j)->cp_stat[k] = ABORTING;
1716 continue; 1715 continue;
1717 } 1716 }
@@ -1914,10 +1913,9 @@ static irqreturn_t ihdlr(int irq, unsigned int j) {
1914 spp->adapter_status != ASST && HD(j)->iocount <= 1000) || 1913 spp->adapter_status != ASST && HD(j)->iocount <= 1000) ||
1915 do_trace || msg_byte(spp->target_status)) 1914 do_trace || msg_byte(spp->target_status))
1916#endif 1915#endif
1917 printk("%s: ihdlr, mbox %2d, err 0x%x:%x,"\ 1916 scmd_printk(KERN_INFO, SCpnt, "ihdlr, mbox %2d, err 0x%x:%x,"\
1918 " target %d.%d:%d, pid %ld, reg 0x%x, count %d.\n", 1917 " pid %ld, reg 0x%x, count %d.\n",
1919 BN(j), i, spp->adapter_status, spp->target_status, 1918 i, spp->adapter_status, spp->target_status, SCpnt->pid,
1920 SCpnt->device->channel, SCpnt->device->id, SCpnt->device->lun, SCpnt->pid,
1921 reg, HD(j)->iocount); 1919 reg, HD(j)->iocount);
1922 1920
1923 unmap_dma(i, j); 1921 unmap_dma(i, j);