On 07/06/2016 05:14 PM, Himanshu Madhani wrote:
> From: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
>
> Signed-off-by: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
> Signed-off-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_dbg.c | 2 +-
> drivers/scsi/qla2xxx/qla_isr.c | 8 +++-----
> drivers/scsi/qla2xxx/qla_mbx.c | 5 -----
> 3 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
> index 288338d..1a04270 100644
> --- a/drivers/scsi/qla2xxx/qla_dbg.c
> +++ b/drivers/scsi/qla2xxx/qla_dbg.c
> @@ -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, |
> diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
> index 134ad2f..1b87977 100644
> --- a/drivers/scsi/qla2xxx/qla_isr.c
> +++ b/drivers/scsi/qla2xxx/qla_isr.c
> @@ -1159,13 +1159,11 @@ global_port_update:
>
> 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:
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index 0f7b83a..bf16e6f 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -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) {
>
Reviewed-by: Hannes Reinecke <hare@xxxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
