These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / scsi / qla2xxx / qla_nx2.c

diff --git a/kernel/drivers/scsi/qla2xxx/qla_nx2.c b/kernel/drivers/scsi/qla2xxx/qla_nx2.c
index ed4d6b6..007192d 100644 (file)
--- a/kernel/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/kernel/drivers/scsi/qla2xxx/qla_nx2.c
@@ -397,11 +397,11 @@ qla8044_idc_lock(struct qla_hw_data *ha)
                                 * has the lock, wait for 2secs
                                 * and retry
                                 */
-                                ql_dbg(ql_dbg_p3p, vha, 0xb08a,
-                                    "%s: IDC lock Recovery by %d "
-                                    "failed, Retrying timeout\n", __func__,
-                                    ha->portnum);
-                                timeout = 0;
+                               ql_dbg(ql_dbg_p3p, vha, 0xb08a,
+                                      "%s: IDC lock Recovery by %d "
+                                      "failed, Retrying timeout\n", __func__,
+                                      ha->portnum);
+                               timeout = 0;
                        }
                }
                msleep(QLA8044_DRV_LOCK_MSLEEP);
@@ -462,12 +462,11 @@ qla8044_flash_lock(scsi_qla_host_t *vha)
 static void
 qla8044_flash_unlock(scsi_qla_host_t *vha)
 {
-       int ret_val;
        struct qla_hw_data *ha = vha->hw;
 
        /* Reading FLASH_UNLOCK register unlocks the Flash */
        qla8044_wr_reg(ha, QLA8044_FLASH_LOCK_ID, 0xFF);
-       ret_val = qla8044_rd_reg(ha, QLA8044_FLASH_UNLOCK);
+       qla8044_rd_reg(ha, QLA8044_FLASH_UNLOCK);
 }
 
 
@@ -561,7 +560,7 @@ qla8044_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
        return buf;
 }
 
-inline int
+static inline int
 qla8044_need_reset(struct scsi_qla_host *vha)
 {
        uint32_t drv_state, drv_active;
@@ -1130,9 +1129,9 @@ qla8044_ms_mem_write_128b(struct scsi_qla_host *vha,
        }
 
        for (i = 0; i < count; i++, addr += 16) {
-               if (!((QLA8044_ADDR_IN_RANGE(addr, QLA8044_ADDR_QDR_NET,
+               if (!((addr_in_range(addr, QLA8044_ADDR_QDR_NET,
                    QLA8044_ADDR_QDR_NET_MAX)) ||
-                   (QLA8044_ADDR_IN_RANGE(addr, QLA8044_ADDR_DDR_NET,
+                   (addr_in_range(addr, QLA8044_ADDR_DDR_NET,
                        QLA8044_ADDR_DDR_NET_MAX)))) {
                        ret_val = QLA_FUNCTION_FAILED;
                        goto exit_ms_mem_write_unlock;
@@ -1605,7 +1604,7 @@ qla8044_set_idc_dontreset(struct scsi_qla_host *vha)
        qla8044_wr_reg(ha, QLA8044_IDC_DRV_CTRL, idc_ctrl);
 }
 
-inline void
+static inline void
 qla8044_set_rst_ready(struct scsi_qla_host *vha)
 {
        uint32_t drv_state;
@@ -2992,7 +2991,7 @@ qla8044_minidump_process_rddfe(struct scsi_qla_host *vha,
        uint32_t addr1, addr2, value, data, temp, wrVal;
        uint8_t stride, stride2;
        uint16_t count;
-       uint32_t poll, mask, data_size, modify_mask;
+       uint32_t poll, mask, modify_mask;
        uint32_t wait_count = 0;
 
        uint32_t *data_ptr = *d_ptr;
@@ -3009,7 +3008,6 @@ qla8044_minidump_process_rddfe(struct scsi_qla_host *vha,
        poll = rddfe->poll;
        mask = rddfe->mask;
        modify_mask = rddfe->modify_mask;
-       data_size = rddfe->data_size;
 
        addr2 = addr1 + stride;
 
@@ -3091,7 +3089,7 @@ qla8044_minidump_process_rdmdio(struct scsi_qla_host *vha,
        uint8_t stride1, stride2;
        uint32_t addr3, addr4, addr5, addr6, addr7;
        uint16_t count, loop_cnt;
-       uint32_t poll, mask;
+       uint32_t mask;
        uint32_t *data_ptr = *d_ptr;
 
        struct qla8044_minidump_entry_rdmdio *rdmdio;
@@ -3105,7 +3103,6 @@ qla8044_minidump_process_rdmdio(struct scsi_qla_host *vha,
        stride2 = rdmdio->stride_2;
        count = rdmdio->count;
 
-       poll = rdmdio->poll;
        mask = rdmdio->mask;
        value2 = rdmdio->value_2;
 
@@ -3141,8 +3138,7 @@ qla8044_minidump_process_rdmdio(struct scsi_qla_host *vha,
                        goto error;
 
                addr7 = addr2 - (4 * stride1);
-                       data = qla8044_ipmdio_rd_reg(vha, addr1, addr3,
-                           mask, addr7);
+               data = qla8044_ipmdio_rd_reg(vha, addr1, addr3, mask, addr7);
                if (data == -1)
                        goto error;
 
@@ -3165,7 +3161,7 @@ error:
 static uint32_t qla8044_minidump_process_pollwr(struct scsi_qla_host *vha,
                struct qla8044_minidump_entry_hdr *entry_hdr, uint32_t **d_ptr)
 {
-       uint32_t addr1, addr2, value1, value2, poll, mask, r_value;
+       uint32_t addr1, addr2, value1, value2, poll, r_value;
        uint32_t wait_count = 0;
        struct qla8044_minidump_entry_pollwr *pollwr_hdr;
 
@@ -3176,7 +3172,6 @@ static uint32_t qla8044_minidump_process_pollwr(struct scsi_qla_host *vha,
        value2 = pollwr_hdr->value_2;
 
        poll = pollwr_hdr->poll;
-       mask = pollwr_hdr->mask;
 
        while (wait_count < poll) {
                qla8044_rd_reg_indirect(vha, addr1, &r_value);