aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/eata.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/eata.c')
-rw-r--r--drivers/scsi/eata.c56
1 files changed, 23 insertions, 33 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 3d13fdee4fc2..b45a4c730230 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -941,8 +941,6 @@ static int eata2x_slave_configure(struct scsi_device *dev)
941{ 941{
942 int tqd, utqd; 942 int tqd, utqd;
943 char *tag_suffix, *link_suffix; 943 char *tag_suffix, *link_suffix;
944 struct Scsi_Host *shost = dev->host;
945 struct hostdata *ha = (struct hostdata *)shost->hostdata;
946 944
947 utqd = MAX_CMD_PER_LUN; 945 utqd = MAX_CMD_PER_LUN;
948 tqd = max_queue_depth; 946 tqd = max_queue_depth;
@@ -973,8 +971,8 @@ static int eata2x_slave_configure(struct scsi_device *dev)
973 else 971 else
974 link_suffix = ""; 972 link_suffix = "";
975 973
976 printk("%s: scsi%d, channel %d, id %d, lun %d, cmds/lun %d%s%s.\n", 974 sdev_printk(KERN_INFO, dev,
977 ha->board_name, shost->host_no, dev->channel, dev->id, dev->lun, 975 "cmds/lun %d%s%s.\n",
978 dev->queue_depth, link_suffix, tag_suffix); 976 dev->queue_depth, link_suffix, tag_suffix);
979 977
980 return 0; 978 return 0;
@@ -1813,9 +1811,8 @@ static int eata2x_queuecommand(struct scsi_cmnd *SCpnt,
1813 SCpnt->host_scribble = (unsigned char *)&cpp->cpp_index; 1811 SCpnt->host_scribble = (unsigned char *)&cpp->cpp_index;
1814 1812
1815 if (do_trace) 1813 if (do_trace)
1816 printk("%s: qcomm, mbox %d, target %d.%d:%d, pid %ld.\n", 1814 scmd_printk(KERN_INFO, SCpnt,
1817 ha->board_name, i, SCpnt->device->channel, SCpnt->device->id, 1815 "qcomm, mbox %d, pid %ld.\n", i, SCpnt->pid);
1818 SCpnt->device->lun, SCpnt->pid);
1819 1816
1820 cpp->reqsen = 1; 1817 cpp->reqsen = 1;
1821 cpp->dispri = 1; 1818 cpp->dispri = 1;
@@ -1847,9 +1844,8 @@ static int eata2x_queuecommand(struct scsi_cmnd *SCpnt,
1847 if (do_dma(shost->io_port, cpp->cp_dma_addr, SEND_CP_DMA)) { 1844 if (do_dma(shost->io_port, cpp->cp_dma_addr, SEND_CP_DMA)) {
1848 unmap_dma(i, ha); 1845 unmap_dma(i, ha);
1849 SCpnt->host_scribble = NULL; 1846 SCpnt->host_scribble = NULL;
1850 printk("%s: qcomm, target %d.%d:%d, pid %ld, adapter busy.\n", 1847 scmd_printk(KERN_INFO, SCpnt,
1851 ha->board_name, SCpnt->device->channel, SCpnt->device->id, 1848 "qcomm, pid %ld, adapter busy.\n", SCpnt->pid);
1852 SCpnt->device->lun, SCpnt->pid);
1853 return 1; 1849 return 1;
1854 } 1850 }
1855 1851
@@ -1864,16 +1860,14 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg)
1864 unsigned int i; 1860 unsigned int i;
1865 1861
1866 if (SCarg->host_scribble == NULL) { 1862 if (SCarg->host_scribble == NULL) {
1867 printk("%s: abort, target %d.%d:%d, pid %ld inactive.\n", 1863 scmd_printk(KERN_INFO, SCarg,
1868 ha->board_name, SCarg->device->channel, SCarg->device->id, 1864 "abort, pid %ld inactive.\n", SCarg->pid);
1869 SCarg->device->lun, SCarg->pid);
1870 return SUCCESS; 1865 return SUCCESS;
1871 } 1866 }
1872 1867
1873 i = *(unsigned int *)SCarg->host_scribble; 1868 i = *(unsigned int *)SCarg->host_scribble;
1874 printk("%s: abort, mbox %d, target %d.%d:%d, pid %ld.\n", 1869 scmd_printk(KERN_WARNING, SCarg,
1875 ha->board_name, i, SCarg->device->channel, SCarg->device->id, 1870 "abort, mbox %d, pid %ld.\n", i, SCarg->pid);
1876 SCarg->device->lun, SCarg->pid);
1877 1871
1878 if (i >= shost->can_queue) 1872 if (i >= shost->can_queue)
1879 panic("%s: abort, invalid SCarg->host_scribble.\n", ha->board_name); 1873 panic("%s: abort, invalid SCarg->host_scribble.\n", ha->board_name);
@@ -1934,9 +1928,8 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
1934 struct Scsi_Host *shost = SCarg->device->host; 1928 struct Scsi_Host *shost = SCarg->device->host;
1935 struct hostdata *ha = (struct hostdata *)shost->hostdata; 1929 struct hostdata *ha = (struct hostdata *)shost->hostdata;
1936 1930
1937 printk("%s: reset, enter, target %d.%d:%d, pid %ld.\n", 1931 scmd_printk(KERN_INFO, SCarg,
1938 ha->board_name, SCarg->device->channel, SCarg->device->id, 1932 "reset, enter, pid %ld.\n", SCarg->pid);
1939 SCarg->device->lun, SCarg->pid);
1940 1933
1941 spin_lock_irq(shost->host_lock); 1934 spin_lock_irq(shost->host_lock);
1942 1935
@@ -2253,12 +2246,11 @@ static int reorder(struct hostdata *ha, unsigned long cursec,
2253 k = il[n]; 2246 k = il[n];
2254 cpp = &ha->cp[k]; 2247 cpp = &ha->cp[k];
2255 SCpnt = cpp->SCpnt; 2248 SCpnt = cpp->SCpnt;
2256 printk 2249 scmd_printk(KERN_INFO, SCpnt,
2257 ("%s %d.%d:%d pid %ld mb %d fc %d nr %d sec %ld ns %ld" 2250 "%s pid %ld mb %d fc %d nr %d sec %ld ns %ld"
2258 " cur %ld s:%c r:%c rev:%c in:%c ov:%c xd %d.\n", 2251 " cur %ld s:%c r:%c rev:%c in:%c ov:%c xd %d.\n",
2259 (ihdlr ? "ihdlr" : "qcomm"), 2252 (ihdlr ? "ihdlr" : "qcomm"),
2260 SCpnt->device->channel, SCpnt->device->id, 2253 SCpnt->pid, k, flushcount,
2261 SCpnt->device->lun, SCpnt->pid, k, flushcount,
2262 n_ready, SCpnt->request->sector, 2254 n_ready, SCpnt->request->sector,
2263 SCpnt->request->nr_sectors, cursec, YESNO(s), 2255 SCpnt->request->nr_sectors, cursec, YESNO(s),
2264 YESNO(r), YESNO(rev), YESNO(input_only), 2256 YESNO(r), YESNO(rev), YESNO(input_only),
@@ -2301,12 +2293,11 @@ static void flush_dev(struct scsi_device *dev, unsigned long cursec,
2301 SCpnt = cpp->SCpnt; 2293 SCpnt = cpp->SCpnt;
2302 2294
2303 if (do_dma(dev->host->io_port, cpp->cp_dma_addr, SEND_CP_DMA)) { 2295 if (do_dma(dev->host->io_port, cpp->cp_dma_addr, SEND_CP_DMA)) {
2304 printk 2296 scmd_printk(KERN_INFO, SCpnt,
2305 ("%s: %s, target %d.%d:%d, pid %ld, mbox %d, adapter" 2297 "%s, pid %ld, mbox %d, adapter"
2306 " busy, will abort.\n", ha->board_name, 2298 " busy, will abort.\n",
2307 (ihdlr ? "ihdlr" : "qcomm"), 2299 (ihdlr ? "ihdlr" : "qcomm"),
2308 SCpnt->device->channel, SCpnt->device->id, 2300 SCpnt->pid, k);
2309 SCpnt->device->lun, SCpnt->pid, k);
2310 ha->cp_stat[k] = ABORTING; 2301 ha->cp_stat[k] = ABORTING;
2311 continue; 2302 continue;
2312 } 2303 }
@@ -2542,11 +2533,10 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
2542 spp->adapter_status != ASST && ha->iocount <= 1000) || 2533 spp->adapter_status != ASST && ha->iocount <= 1000) ||
2543 do_trace || msg_byte(spp->target_status)) 2534 do_trace || msg_byte(spp->target_status))
2544#endif 2535#endif
2545 printk("%s: ihdlr, mbox %2d, err 0x%x:%x," 2536 scmd_printk(KERN_INFO, SCpnt, "ihdlr, mbox %2d, err 0x%x:%x,"
2546 " target %d.%d:%d, pid %ld, reg 0x%x, count %d.\n", 2537 " pid %ld, reg 0x%x, count %d.\n",
2547 ha->board_name, i, spp->adapter_status, spp->target_status, 2538 i, spp->adapter_status, spp->target_status,
2548 SCpnt->device->channel, SCpnt->device->id, 2539 SCpnt->pid, reg, ha->iocount);
2549 SCpnt->device->lun, SCpnt->pid, reg, ha->iocount);
2550 2540
2551 unmap_dma(i, ha); 2541 unmap_dma(i, ha);
2552 2542