[PATCH 12/50] NCR5380: Use blk_req() instead of scsi_cmnd.request

Bart Van Assche
2021-05-14T21:34:29Z

drivers/scsi/NCR5380.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 2ddbcaa667d1..cfeadbd98669 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -778,7 +778,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)
}

#ifdef CONFIG_SUN3
- if ((sun3scsi_dma_finish(rq_data_dir(hostdata->connected->request)))) {
+ if ((sun3scsi_dma_finish(rq_data_dir(blk_req(hostdata->connected))))) {
pr_err("scsi%d: overrun in UDC counter -- not prepared to deal with this!\n",
instance->host_no);
BUG();
@@ -1710,7 +1710,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
count = sun3scsi_dma_xfer_len(hostdata, cmd);

if (count > 0) {
- if (rq_data_dir(cmd->request))
+ if (rq_data_dir(blk_req(cmd)))
sun3scsi_dma_send_setup(hostdata,
cmd->SCp.ptr, count);
else
@@ -2158,7 +2158,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
count = sun3scsi_dma_xfer_len(hostdata, tmp);

if (count > 0) {
- if (rq_data_dir(tmp->request))
+ if (rq_data_dir(blk_req(tmp)))
sun3scsi_dma_send_setup(hostdata,
tmp->SCp.ptr, count);
else