From patchwork Mon Aug 9 23:03:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 494153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6A12C4320A for ; Mon, 9 Aug 2021 23:04:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CBE6A60F38 for ; Mon, 9 Aug 2021 23:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237016AbhHIXFI (ORCPT ); Mon, 9 Aug 2021 19:05:08 -0400 Received: from mail-pl1-f175.google.com ([209.85.214.175]:45987 "EHLO mail-pl1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235051AbhHIXFC (ORCPT ); Mon, 9 Aug 2021 19:05:02 -0400 Received: by mail-pl1-f175.google.com with SMTP id d17so18326197plr.12 for ; Mon, 09 Aug 2021 16:04:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KAGONwU2Ix3aXwytjxc1FfNzoxkRboKLNCgioIOWq0o=; b=pY8b/PWnTtQY88Gv5fVWtl0YcuTvyH7jZV7m1/XGQFSv2+dUjCg7sDiHwWDbbk0HxH IIcSRN6E3ztFXYR/6U7eXqoGzmJEwSiSKVseoCbXozDloMvB0nrik/YosQ3ANBM/GIzr 2jZArdVsYgQqd3gwg0mSNabrEfOGqaX2+VX+w0O5EZb7H8GzFqEQc7GwCp6jLYsd3DT1 O7P9Nh1hD+wttneIZxxPTJJ/SmmK6a6sy6kMWPHjmGJRaxpCgCwnMZuaAiFaq6k9AJlo /XM7Cj24w6Ad7OrEPFEfe11S6+u6a0jr57gb3YCQXpK6HbJUETL21wTOV/bQ+c4uhGdI TfCg== X-Gm-Message-State: AOAM533MS+4HxxX3CNC0WfTG/wfPUK6vWcOapDGUI+UlmdS11zEDwP/4 3xF3yJux5g4P8/vvD1BeMeY= X-Google-Smtp-Source: ABdhPJzhtlRJYvhv6Dqppbl6j34WJBqdHmD3pDK+U3S7+/wRlhpANCIsO1tJaNycmkwIPJwYMgZrjg== X-Received: by 2002:a62:1982:0:b029:356:3484:b7ec with SMTP id 124-20020a6219820000b02903563484b7ecmr26349992pfz.48.1628550281268; Mon, 09 Aug 2021 16:04:41 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:7dd4:e46e:368b:7454]) by smtp.gmail.com with ESMTPSA id j6sm24102260pgq.0.2021.08.09.16.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Aug 2021 16:04:40 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Adaptec OEM Raid Solutions , "James E.J. Bottomley" Subject: [PATCH v5 25/52] ips: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Date: Mon, 9 Aug 2021 16:03:28 -0700 Message-Id: <20210809230355.8186-26-bvanassche@acm.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210809230355.8186-1-bvanassche@acm.org> References: <20210809230355.8186-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org 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 --- drivers/scsi/ips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 8b33c9871484..cdd94fb2aab7 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -3735,7 +3735,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb) scb->cmd.dcdb.segment_4G = 0; scb->cmd.dcdb.enhanced_sg = 0; - TimeOut = scb->scsi_cmd->request->timeout; + TimeOut = scsi_cmd_to_rq(scb->scsi_cmd)->timeout; if (ha->subsys->param[4] & 0x00100000) { /* If NEW Tape DCDB is Supported */ if (!scb->sg_len) {