scsi: qla2xxx: Use get_unaligned_*() instead of open-coding these functions

This patch improves readability and does not change any functionality.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Link: https://lore.kernel.org/r/20191219005050.40193-1-bvanassche@acm.org
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 2b3702b..d7169e4 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -797,7 +797,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 
        if (atomic_read(&vha->loop_state) == LOOP_READY &&
            (ha->current_topology == ISP_CFG_F ||
-           (le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE &&
+           (get_unaligned_le32(req_data) == ELS_OPCODE_BYTE &&
             req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
            elreq.options == EXTERNAL_LOOPBACK) {
                type = "FC_BSG_HST_VENDOR_ECHO_DIAG";

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 8fadc86..e7bad0b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2173,12 +2173,12 @@ qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24)
         * swab32 of the "data" field in the beginning of qla2x00_status_entry()
         * would make guard field appear at offset 2
         */
-       a_guard   = le16_to_cpu(*(uint16_t *)(ap + 2));
-       a_app_tag = le16_to_cpu(*(uint16_t *)(ap + 0));
-       a_ref_tag = le32_to_cpu(*(uint32_t *)(ap + 4));
-       e_guard   = le16_to_cpu(*(uint16_t *)(ep + 2));
-       e_app_tag = le16_to_cpu(*(uint16_t *)(ep + 0));
-       e_ref_tag = le32_to_cpu(*(uint32_t *)(ep + 4));
+       a_guard   = get_unaligned_le16(ap + 2);
+       a_app_tag = get_unaligned_le16(ap + 0);
+       a_ref_tag = get_unaligned_le32(ap + 4);
+       e_guard   = get_unaligned_le16(ep + 2);
+       e_app_tag = get_unaligned_le16(ep + 0);
+       e_ref_tag = get_unaligned_le32(ep + 4);
 
        ql_dbg(ql_dbg_io, vha, 0x3023,
            "iocb(s) %p Returned STATUS.\n", sts24);

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 6de7ad8..185c5f3 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1882,7 +1882,7 @@ qla82xx_set_product_offset(struct qla_hw_data *ha)
 static int
 qla82xx_validate_firmware_blob(scsi_qla_host_t *vha, uint8_t fw_type)
 {
-       __le32 val;
+       uint32_t val;
        uint32_t min_size;
        struct qla_hw_data *ha = vha->hw;
        const struct firmware *fw = ha->hablob->fw;
@@ -1895,8 +1895,8 @@ qla82xx_validate_firmware_blob(scsi_qla_host_t *vha, uint8_t fw_type)
 
                min_size = QLA82XX_URI_FW_MIN_SIZE;
        } else {
-               val = cpu_to_le32(*(u32 *)&fw->data[QLA82XX_FW_MAGIC_OFFSET]);
-               if ((__force u32)val != QLA82XX_BDINFO_MAGIC)
+               val = get_unaligned_le32(&fw->data[QLA82XX_FW_MAGIC_OFFSET]);
+               if (val != QLA82XX_BDINFO_MAGIC)
                        return -EINVAL;
 
                min_size = QLA82XX_FW_MIN_SIZE;

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 97af678..70081b3 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -3457,13 +3457,13 @@ qlt_handle_dif_error(struct qla_qpair *qpair, struct qla_tgt_cmd *cmd,
 
        cmd->trc_flags |= TRC_DIF_ERR;
 
-       cmd->a_guard   = be16_to_cpu(*(uint16_t *)(ap + 0));
-       cmd->a_app_tag = be16_to_cpu(*(uint16_t *)(ap + 2));
-       cmd->a_ref_tag = be32_to_cpu(*(uint32_t *)(ap + 4));
+       cmd->a_guard   = get_unaligned_be16(ap + 0);
+       cmd->a_app_tag = get_unaligned_be16(ap + 2);
+       cmd->a_ref_tag = get_unaligned_be32(ap + 4);
 
-       cmd->e_guard   = be16_to_cpu(*(uint16_t *)(ep + 0));
-       cmd->e_app_tag = be16_to_cpu(*(uint16_t *)(ep + 2));
-       cmd->e_ref_tag = be32_to_cpu(*(uint32_t *)(ep + 4));
+       cmd->e_guard   = get_unaligned_be16(ep + 0);
+       cmd->e_app_tag = get_unaligned_be16(ep + 2);
+       cmd->e_ref_tag = get_unaligned_be32(ep + 4);
 
        ql_dbg(ql_dbg_tgt_dif, vha, 0xf075,
            "%s: aborted %d state %d\n", __func__, cmd->aborted, cmd->state);

diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index d006f0a..6539499 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -379,8 +379,7 @@ static inline int get_datalen_for_atio(struct atio_from_isp *atio)
 {
        int len = atio->u.isp24.fcp_cmnd.add_cdb_len;
 
-       return (be32_to_cpu(get_unaligned((uint32_t *)
-           &atio->u.isp24.fcp_cmnd.add_cdb[len * 4])));
+       return get_unaligned_be32(&atio->u.isp24.fcp_cmnd.add_cdb[len * 4]);
 }
 
 #define CTIO_TYPE7 0x12 /* Continue target I/O entry (for 24xx) */