summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aha1542.c
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2015-02-06 17:11:29 -0500
committerJames Bottomley <JBottomley@Odin.com>2015-04-09 21:06:53 -0400
commitf232d538017ec0da1df66cf22dc5a5842077b0e6 (patch)
treee8d21305fb2067db6fd9080083cd6d0f9577b429 /drivers/scsi/aha1542.c
parent09a44833887dfc856facff0a9b21f3def0367f0c (diff)
aha1542: remove empty aha1542_stat
Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/aha1542.c')
-rw-r--r--drivers/scsi/aha1542.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index af1e8fa41413..ebc5476e9709 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -154,12 +154,6 @@ static inline void aha1542_intr_reset(u16 base)
154 } \ 154 } \
155 } 155 }
156 156
157static void aha1542_stat(void)
158{
159/* int s = inb(STATUS), i = inb(INTRFLAGS);
160 printk("status=%x intrflags=%x\n", s, i, WAITnexttimeout-WAITtimeout); */
161}
162
163/* This is a bit complicated, but we need to make sure that an interrupt 157/* This is a bit complicated, but we need to make sure that an interrupt
164 routine does not send something out while we are in the middle of this. 158 routine does not send something out while we are in the middle of this.
165 Fortunately, it is only at boot time that multi-byte messages 159 Fortunately, it is only at boot time that multi-byte messages
@@ -196,7 +190,6 @@ fail:
196 if (got_lock) 190 if (got_lock)
197 spin_unlock_irqrestore(&aha1542_lock, flags); 191 spin_unlock_irqrestore(&aha1542_lock, flags);
198 printk(KERN_ERR "aha1542_out failed(%d): ", len + 1); 192 printk(KERN_ERR "aha1542_out failed(%d): ", len + 1);
199 aha1542_stat();
200 return 1; 193 return 1;
201} 194}
202 195
@@ -217,7 +210,6 @@ static int aha1542_in(unsigned int base, u8 *cmdp, int len)
217fail: 210fail:
218 spin_unlock_irqrestore(&aha1542_lock, flags); 211 spin_unlock_irqrestore(&aha1542_lock, flags);
219 printk(KERN_ERR "aha1542_in failed(%d): ", len + 1); 212 printk(KERN_ERR "aha1542_in failed(%d): ", len + 1);
220 aha1542_stat();
221 return 1; 213 return 1;
222} 214}
223 215
@@ -590,7 +582,6 @@ static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *
590 printk(KERN_DEBUG "aha1542_queuecommand: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen); 582 printk(KERN_DEBUG "aha1542_queuecommand: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen);
591 else 583 else
592 printk(KERN_DEBUG "aha1542_command: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen); 584 printk(KERN_DEBUG "aha1542_command: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen);
593 aha1542_stat();
594 printk(KERN_DEBUG "aha1542_queuecommand: dumping scsi cmd:"); 585 printk(KERN_DEBUG "aha1542_queuecommand: dumping scsi cmd:");
595 for (i = 0; i < SCpnt->cmd_len; i++) 586 for (i = 0; i < SCpnt->cmd_len; i++)
596 printk("%02x ", cmd[i]); 587 printk("%02x ", cmd[i]);
@@ -691,12 +682,10 @@ static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *
691#endif 682#endif
692 683
693 if (done) { 684 if (done) {
694 DEB(printk("aha1542_queuecommand: now waiting for interrupt "); 685 DEB(printk("aha1542_queuecommand: now waiting for interrupt "));
695 aha1542_stat());
696 SCpnt->scsi_done = done; 686 SCpnt->scsi_done = done;
697 mb[mbo].status = 1; 687 mb[mbo].status = 1;
698 aha1542_out(SCpnt->device->host->io_port, &ahacmd, 1); /* start scsi command */ 688 aha1542_out(SCpnt->device->host->io_port, &ahacmd, 1); /* start scsi command */
699 DEB(aha1542_stat());
700 } else 689 } else
701 printk("aha1542_queuecommand: done can't be NULL\n"); 690 printk("aha1542_queuecommand: done can't be NULL\n");
702 691
@@ -1017,11 +1006,8 @@ fail:
1017 printk(", DMA priority %d", dma_chan); 1006 printk(", DMA priority %d", dma_chan);
1018 printk("\n"); 1007 printk("\n");
1019 1008
1020 DEB(aha1542_stat());
1021 setup_mailboxes(base_io, shpnt); 1009 setup_mailboxes(base_io, shpnt);
1022 1010
1023 DEB(aha1542_stat());
1024
1025 DEB(printk("aha1542_detect: enable interrupt channel %d\n", irq_level)); 1011 DEB(printk("aha1542_detect: enable interrupt channel %d\n", irq_level));
1026 spin_lock_irqsave(&aha1542_lock, flags); 1012 spin_lock_irqsave(&aha1542_lock, flags);
1027 if (request_irq(irq_level, do_aha1542_intr_handle, 0, 1013 if (request_irq(irq_level, do_aha1542_intr_handle, 0,