diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2021-08-10 01:03:37 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-12 04:25:40 +0200 |
| commit | 0f8f3ea84a894b637b6353191b56ced57f0e69a8 (patch) | |
| tree | 4d0c7283571ffc6bf1615d5386ab7180b8ac6087 | |
| parent | scsi: myrs: Use scsi_cmd_to_rq() instead of scsi_cmnd.request (diff) | |
| download | linux-0f8f3ea84a894b637b6353191b56ced57f0e69a8.tar.xz linux-0f8f3ea84a894b637b6353191b56ced57f0e69a8.zip | |
scsi: ncr53c8xx: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
Prepare for removal of the request pointer by using scsi_cmd_to_rq()
instead. This patch does not change any functionality.
Link: https://lore.kernel.org/r/20210809230355.8186-35-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/ncr53c8xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index c76e9f05d042..09958f78b70f 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c @@ -4164,8 +4164,8 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd) ** **---------------------------------------------------- */ - if (np->settle_time && cmd->request->timeout >= HZ) { - u_long tlimit = jiffies + cmd->request->timeout - HZ; + if (np->settle_time && scsi_cmd_to_rq(cmd)->timeout >= HZ) { + u_long tlimit = jiffies + scsi_cmd_to_rq(cmd)->timeout - HZ; if (time_after(np->settle_time, tlimit)) np->settle_time = tlimit; } |