From: Ondrej Zary Date: Fri, 6 Feb 2015 22:11:29 +0000 (+0100) Subject: aha1542: remove empty aha1542_stat X-Git-Tag: v4.1-rc1~107^2~67 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f232d538017ec0da1df66cf22dc5a5842077b0e6;p=linux.git aha1542: remove empty aha1542_stat Signed-off-by: Ondrej Zary Reviewed-by: Christoph Hellwig Signed-off-by: James Bottomley --- 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) } \ } -static void aha1542_stat(void) -{ -/* int s = inb(STATUS), i = inb(INTRFLAGS); - printk("status=%x intrflags=%x\n", s, i, WAITnexttimeout-WAITtimeout); */ -} - /* This is a bit complicated, but we need to make sure that an interrupt routine does not send something out while we are in the middle of this. Fortunately, it is only at boot time that multi-byte messages @@ -196,7 +190,6 @@ static int aha1542_out(unsigned int base, u8 *cmdp, int len) if (got_lock) spin_unlock_irqrestore(&aha1542_lock, flags); printk(KERN_ERR "aha1542_out failed(%d): ", len + 1); - aha1542_stat(); return 1; } @@ -217,7 +210,6 @@ static int aha1542_in(unsigned int base, u8 *cmdp, int len) fail: spin_unlock_irqrestore(&aha1542_lock, flags); printk(KERN_ERR "aha1542_in failed(%d): ", len + 1); - aha1542_stat(); return 1; } @@ -590,7 +582,6 @@ static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd * printk(KERN_DEBUG "aha1542_queuecommand: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen); else printk(KERN_DEBUG "aha1542_command: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen); - aha1542_stat(); printk(KERN_DEBUG "aha1542_queuecommand: dumping scsi cmd:"); for (i = 0; i < SCpnt->cmd_len; i++) printk("%02x ", cmd[i]); @@ -691,12 +682,10 @@ static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd * #endif if (done) { - DEB(printk("aha1542_queuecommand: now waiting for interrupt "); - aha1542_stat()); + DEB(printk("aha1542_queuecommand: now waiting for interrupt ")); SCpnt->scsi_done = done; mb[mbo].status = 1; aha1542_out(SCpnt->device->host->io_port, &ahacmd, 1); /* start scsi command */ - DEB(aha1542_stat()); } else printk("aha1542_queuecommand: done can't be NULL\n"); @@ -1017,11 +1006,8 @@ static struct Scsi_Host *aha1542_hw_init(struct scsi_host_template *tpnt, struct printk(", DMA priority %d", dma_chan); printk("\n"); - DEB(aha1542_stat()); setup_mailboxes(base_io, shpnt); - DEB(aha1542_stat()); - DEB(printk("aha1542_detect: enable interrupt channel %d\n", irq_level)); spin_lock_irqsave(&aha1542_lock, flags); if (request_irq(irq_level, do_aha1542_intr_handle, 0,