qla2xxx: Remove set-but-not-used variables

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / qla2xxx / qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 5559d5e75bbf99bf98765636486d38d945336081..a526c389fa2fc0ee97ca41bfd926b4b556bea484 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -116,7 +116,7 @@ bool
 qla2x00_check_reg32_for_disconnect(scsi_qla_host_t *vha, uint32_t reg)
 {
        /* Check for PCI disconnection */
-       if (reg == 0xffffffff) {
+       if (reg == 0xffffffff && !pci_channel_offline(vha->hw->pdev)) {
                if (!test_and_set_bit(PFLG_DISCONNECTED, &vha->pci_flags) &&
                    !test_bit(PFLG_DRIVER_REMOVING, &vha->pci_flags) &&
                    !test_bit(PFLG_DRIVER_PROBING, &vha->pci_flags)) {
@@ -575,7 +575,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
        struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
        struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;
-       uint32_t        rscn_entry, host_pid, tmp_pid;
+       uint32_t        rscn_entry, host_pid;
        unsigned long   flags;
        fc_port_t       *fcport = NULL;
 
@@ -998,7 +998,6 @@ skip_rio:
                list_for_each_entry(fcport, &vha->vp_fcports, list) {
                        if (atomic_read(&fcport->state) != FCS_ONLINE)
                                continue;
-                       tmp_pid = fcport->d_id.b24;
                        if (fcport->d_id.b24 == rscn_entry) {
                                qla2x00_mark_device_lost(vha, fcport, 0, 0);
                                break;