On Tue, May 18, 2021 at 11:15 PM Bart Van Assche <bvanassche@acm.org> wrote:
>
> Prepare for removal of the request pointer by using scsi_cmd_to_rq()
> instead. This patch does not change any functionality.
>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>

> ---
>  drivers/scsi/megaraid/megaraid_sas_base.c   |  4 ++--
>  drivers/scsi/megaraid/megaraid_sas_fusion.c | 10 +++++-----
>  2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
> index 8ed347eebf07..8fc7a3074a21 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_base.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
> @@ -1443,10 +1443,10 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
>          * pthru timeout to the os layer timeout value.
>          */
>         if (scp->device->type == TYPE_TAPE) {
> -               if ((scp->request->timeout / HZ) > 0xFFFF)
> +               if (scsi_cmd_to_rq(scp)->timeout / HZ > 0xFFFF)
>                         pthru->timeout = cpu_to_le16(0xFFFF);
>                 else
> -                       pthru->timeout = cpu_to_le16(scp->request->timeout / HZ);
> +                       pthru->timeout = cpu_to_le16(scsi_cmd_to_rq(scp)->timeout / HZ);
>         }
>
>         /*
> diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
> index 2221175ae051..b894451a3e09 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
> @@ -402,7 +402,7 @@ megasas_get_msix_index(struct megasas_instance *instance,
>                         (mega_mod64(atomic64_add_return(1, &instance->total_io_count),
>                                 instance->msix_vectors));
>         } else if (instance->host->nr_hw_queues > 1) {
> -               u32 tag = blk_mq_unique_tag(scmd->request);
> +               u32 tag = blk_mq_unique_tag(scsi_cmd_to_rq(scmd));
>
>                 cmd->request_desc->SCSIIO.MSIxIndex = blk_mq_unique_tag_to_hwq(tag) +
>                         instance->low_latency_index_start;
> @@ -3024,7 +3024,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance,
>                 io_request->DevHandle = cpu_to_le16(device_id);
>                 io_request->LUN[1] = scmd->device->lun;
>                 pRAID_Context->timeout_value =
> -                       cpu_to_le16 (scmd->request->timeout / HZ);
> +                       cpu_to_le16(scsi_cmd_to_rq(scmd)->timeout / HZ);
>                 cmd->request_desc->SCSIIO.RequestFlags =
>                         (MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO <<
>                         MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);
> @@ -3087,7 +3087,7 @@ megasas_build_syspd_fusion(struct megasas_instance *instance,
>
>         device_id = MEGASAS_DEV_INDEX(scmd);
>         pd_index = MEGASAS_PD_INDEX(scmd);
> -       os_timeout_value = scmd->request->timeout / HZ;
> +       os_timeout_value = scsi_cmd_to_rq(scmd)->timeout / HZ;
>         mr_device_priv_data = scmd->device->hostdata;
>         cmd->pd_interface = mr_device_priv_data->interface_type;
>
> @@ -3376,7 +3376,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
>                 return SCSI_MLQUEUE_HOST_BUSY;
>         }
>
> -       cmd = megasas_get_cmd_fusion(instance, scmd->request->tag);
> +       cmd = megasas_get_cmd_fusion(instance, scsi_cmd_to_rq(scmd)->tag);
>
>         if (!cmd) {
>                 atomic_dec(&instance->fw_outstanding);
> @@ -3417,7 +3417,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
>          */
>         if (cmd->r1_alt_dev_handle != MR_DEVHANDLE_INVALID) {
>                 r1_cmd = megasas_get_cmd_fusion(instance,
> -                               (scmd->request->tag + instance->max_fw_cmds));
> +                               scsi_cmd_to_rq(scmd)->tag + instance->max_fw_cmds);
>                 megasas_prepare_secondRaid1_IO(instance, cmd, r1_cmd);
>         }
>