| Message ID | 20160803184232.GA775@mwanda (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 8/3/16, 11:42 AM, "Dan Carpenter" <dan.carpenter@oracle.com> wrote: >The "if (test_bit(UNLOADING..." line was indented one tab more than it >should have been. There was an extra parenthesis around the >qla2x00_reset_active() function call. I lined up the conditions a bit >so that it shows how they group together. > >Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > >diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c >index 2674f4c..1dd8650 100644 >--- a/drivers/scsi/qla2xxx/qla_os.c >+++ b/drivers/scsi/qla2xxx/qla_os.c >@@ -899,12 +899,12 @@ qla2x00_wait_for_hba_ready(scsi_qla_host_t *vha) > struct qla_hw_data *ha = vha->hw; > scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev); > >- while (((qla2x00_reset_active(vha)) || ha->dpc_active || >- ha->flags.mbox_busy) || >- test_bit(FX00_RESET_RECOVERY, &vha->dpc_flags) || >- test_bit(FX00_TARGET_SCAN, &vha->dpc_flags)) { >- if (test_bit(UNLOADING, &base_vha->dpc_flags)) >- break; >+ while ((qla2x00_reset_active(vha) || ha->dpc_active || >+ ha->flags.mbox_busy) || >+ test_bit(FX00_RESET_RECOVERY, &vha->dpc_flags) || >+ test_bit(FX00_TARGET_SCAN, &vha->dpc_flags)) { >+ if (test_bit(UNLOADING, &base_vha->dpc_flags)) >+ break; > msleep(1000); > } > } Looks Good. Acked-by: Himanshu Madhani <himanshu.madhani@qlogic.com> >
>>>>> "Dan" == Dan Carpenter <dan.carpenter@oracle.com> writes:
Dan> The "if (test_bit(UNLOADING..." line was indented one tab more than
Dan> it should have been. There was an extra parenthesis around the
Dan> qla2x00_reset_active() function call. I lined up the conditions a
Dan> bit so that it shows how they group together.
Applied to 4.9/scsi-queue.
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 2674f4c..1dd8650 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -899,12 +899,12 @@ qla2x00_wait_for_hba_ready(scsi_qla_host_t *vha) struct qla_hw_data *ha = vha->hw; scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev); - while (((qla2x00_reset_active(vha)) || ha->dpc_active || - ha->flags.mbox_busy) || - test_bit(FX00_RESET_RECOVERY, &vha->dpc_flags) || - test_bit(FX00_TARGET_SCAN, &vha->dpc_flags)) { - if (test_bit(UNLOADING, &base_vha->dpc_flags)) - break; + while ((qla2x00_reset_active(vha) || ha->dpc_active || + ha->flags.mbox_busy) || + test_bit(FX00_RESET_RECOVERY, &vha->dpc_flags) || + test_bit(FX00_TARGET_SCAN, &vha->dpc_flags)) { + if (test_bit(UNLOADING, &base_vha->dpc_flags)) + break; msleep(1000); } }
The "if (test_bit(UNLOADING..." line was indented one tab more than it should have been. There was an extra parenthesis around the qla2x00_reset_active() function call. I lined up the conditions a bit so that it shows how they group together. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html