diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2015-02-06 23:11:54 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-04-09 18:09:18 -0700 |
| commit | 764a0c7e840085828afbc16fb9b47be5712f5531 (patch) | |
| tree | c58601c17ca7cc5b248e3fdcce3e41aebfea008e /drivers/scsi/aha1542.c | |
| parent | 6ddc8cf40a2011af0c1a5dd300cc75d727c3c3a8 (diff) | |
| download | lwn-764a0c7e840085828afbc16fb9b47be5712f5531.tar.gz lwn-764a0c7e840085828afbc16fb9b47be5712f5531.zip | |
aha1542: Don't reduce functionality with DEBUG enabled
Enabling DEBUG disables write commands and devices with ID > 1.
Remove this "feature" to allow real debugging.
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.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 87017fbdbc84..a19fcb02ff20 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c @@ -418,15 +418,7 @@ static int aha1542_queuecommand_lck(struct scsi_cmnd *cmd, void (*done) (struct int mbo; struct mailbox *mb = aha1542->mb; struct ccb *ccb = aha1542->ccb; -#ifdef DEBUG - int i; - if (target > 1) { - cmd->result = DID_TIME_OUT << 16; - done(cmd); - return 0; - } -#endif if (*cmd->cmnd == REQUEST_SENSE) { /* Don't do the command - we have the sense data already */ cmd->result = 0; @@ -434,19 +426,16 @@ static int aha1542_queuecommand_lck(struct scsi_cmnd *cmd, void (*done) (struct return 0; } #ifdef DEBUG - if (*cmd->cmnd == READ_10 || *cmd->cmnd == WRITE_10) - i = xscsi2int(cmd->cmnd + 2); - else if (*cmd->cmnd == READ_6 || *cmd->cmnd == WRITE_6) - i = scsi2int(cmd->cmnd + 2); - else - i = -1; - if (done) - shost_printk(KERN_DEBUG, sh, "aha1542_queuecommand: dev %d cmd %02x pos %d len %d ", target, *cmd->cmnd, i, bufflen); - else - shost_printk(KERN_DEBUG, sh, "aha1542_command: dev %d cmd %02x pos %d len %d ", target, *cmd->cmnd, i, bufflen); - print_hex_dump_bytes("command: ", DUMP_PREFIX_NONE, cmd->cmnd, cmd->cmd_len); - if (*cmd->cmnd == WRITE_10 || *cmd->cmnd == WRITE_6) - return 0; /* we are still testing, so *don't* write */ + { + int i = -1; + if (*cmd->cmnd == READ_10 || *cmd->cmnd == WRITE_10) + i = xscsi2int(cmd->cmnd + 2); + else if (*cmd->cmnd == READ_6 || *cmd->cmnd == WRITE_6) + i = scsi2int(cmd->cmnd + 2); + shost_printk(KERN_DEBUG, sh, "aha1542_queuecommand: dev %d cmd %02x pos %d len %d", + target, *cmd->cmnd, i, bufflen); + print_hex_dump_bytes("command: ", DUMP_PREFIX_NONE, cmd->cmnd, cmd->cmd_len); + } #endif /* Use the outgoing mailboxes in a round-robin fashion, because this is how the host adapter will scan for them */ |