Skip to content

Commit

Permalink
qla2xxx: Correction to function qla26xx_dport_diagnostics().
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
Joe Carnuccio authored and Martin K. Petersen committed Jul 15, 2016
1 parent 41233cd commit ef55e51
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/scsi/qla2xxx/qla_dbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* | Module Init and Probe | 0x0191 | 0x0146 |
* | | | 0x015b-0x0160 |
* | | | 0x016e |
* | Mailbox commands | 0x1196 | |
* | Mailbox commands | 0x1196 | 0x1193 |
* | | | |
* | Device Discovery | 0x2003 | 0x2016 |
* | | | 0x2011-0x2012, |
Expand Down
8 changes: 3 additions & 5 deletions drivers/scsi/qla2xxx/qla_isr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1159,13 +1159,11 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)

case MBA_DPORT_DIAGNOSTICS:
ql_dbg(ql_dbg_async, vha, 0x5052,
"D-Port Diagnostics: %04x result=%s index=%u size=%u\n",
"D-Port Diagnostics: %04x result=%s\n",
mb[0],
mb[1] == 0 ? "start" :
mb[1] == 1 ? "done (ok)" :
mb[1] == 2 ? "done (error)" : "other",
LSB(mb[2]),
mb[3]);
mb[1] == 1 ? "done (pass)" :
mb[1] == 2 ? "done (error)" : "other");
break;

case MBA_TEMPERATURE_ALERT:
Expand Down
5 changes: 0 additions & 5 deletions drivers/scsi/qla2xxx/qla_mbx.c
Original file line number Diff line number Diff line change
Expand Up @@ -5764,11 +5764,6 @@ qla26xx_dport_diagnostics(scsi_qla_host_t *vha,
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1192,
"Entered %s.\n", __func__);

if (size < 1024) {
ql_log(ql_log_warn, vha, 0x1193, "Failed insufficient size.\n");
return QLA_FUNCTION_PARAMETER_ERROR;
}

dd_dma = dma_map_single(&vha->hw->pdev->dev,
dd_buf, size, DMA_FROM_DEVICE);
if (!dd_dma) {
Expand Down

0 comments on commit ef55e51

Please sign in to comment.