[SCSI] qla2xxx: Use midlayer's int_to_scsilun() function.

While populating command type 6 and 7 IOCBs.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index fd9df163410c0e624c563eaa3048b2bb4484e6de..63f611904a6c9ec1112a35f6f2b79b2cf94dab93 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -394,7 +394,7 @@ struct cmd_type_6 {
 
        uint16_t fcp_rsp_dsd_len;       /* FCP_RSP DSD length. */
 
-       uint8_t lun[8];                 /* FCP LUN (BE). */
+       struct scsi_lun lun;            /* FCP LUN (BE). */
 
        uint16_t control_flags;         /* Control flags. */
 #define CF_DATA_SEG_DESCR_ENABLE       BIT_2
@@ -432,7 +432,7 @@ struct cmd_type_7 {
        uint16_t dseg_count;            /* Data segment count. */
        uint16_t reserved_1;
 
-       uint8_t lun[8];                 /* FCP LUN (BE). */
+       struct scsi_lun lun;            /* FCP LUN (BE). */
 
        uint16_t task_mgmt_flags;       /* Task management flags. */
 #define TMF_CLEAR_ACA          BIT_14

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index d7355627f11045b7e1c4064c5e955035bf9d1ad5..b58ee79177bc68c2b2b004632da8dd8a7a9ae29f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -839,8 +839,7 @@ qla24xx_start_scsi(srb_t *sp)
        cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
        cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
 
-       cmd_pkt->lun[1] = LSB(sp->cmd->device->lun);
-       cmd_pkt->lun[2] = MSB(sp->cmd->device->lun);
+       int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
 
        /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
        if (scsi_populate_tag_msg(cmd, tag)) {