qla2xxx: Use ssdid to gate semaphore manipulation.
authorJoe Carnuccio <joe.carnuccio@qlogic.com>
Tue, 4 Aug 2015 17:37:53 +0000 (13:37 -0400)
committerJames Bottomley <JBottomley@Odin.com>
Thu, 27 Aug 2015 00:40:44 +0000 (17:40 -0700)
Execute qla25xx_manipulate_risc_semaphore() only for
ssdid 0x0175 and 0x0240.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
drivers/scsi/qla2xxx/qla_init.c

index 5a5ca43..f64bb6b 100644 (file)
@@ -1272,14 +1272,14 @@ qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data)
 static void
 qla25xx_manipulate_risc_semaphore(scsi_qla_host_t *vha)
 {
-       struct qla_hw_data *ha = vha->hw;
        uint32_t wd32 = 0;
        uint delta_msec = 100;
        uint elapsed_msec = 0;
        uint timeout_msec;
        ulong n;
 
-       if (!IS_QLA25XX(ha) && !IS_QLA2031(ha))
+       if (vha->hw->pdev->subsystem_device != 0x0175 &&
+           vha->hw->pdev->subsystem_device != 0x0240)
                return;
 
 attempt: