Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / qla2xxx / qla_os.c

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 7462dd70b1506b35ea9a440012cb26340c25a527..a28815b8276f090901498dafaf39d12c97db42eb 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4418,7 +4418,10 @@ retry_lock2:
 void
 qla83xx_idc_unlock(scsi_qla_host_t *base_vha, uint16_t requester_id)
 {
-       uint16_t options = (requester_id << 15) | BIT_7, retry;
+#if 0
+       uint16_t options = (requester_id << 15) | BIT_7;
+#endif
+       uint16_t retry;
        uint32_t data;
        struct qla_hw_data *ha = base_vha->hw;
 
@@ -4454,6 +4457,7 @@ retry_unlock:
 
        return;
 
+#if 0
        /* XXX: IDC-unlock implementation using access-control mbx */
        retry = 0;
 retry_unlock2:
@@ -4469,6 +4473,7 @@ retry_unlock2:
        }
 
        return;
+#endif
 }
 
 int