diff options
| author | Finn Thain <fthain@linux-m68k.org> | 2022-02-18 22:50:36 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-23 05:11:03 +0300 |
| commit | ff1269cb3d978655fb4f61f87d08a46af9854567 (patch) | |
| tree | d648e8d18f356f21584a5f946566080ff55e0d8b /drivers/scsi/mac_scsi.c | |
| parent | cd614642e1a24e501633d5aea79c1bafb10d9f36 (diff) | |
| download | linux-ff1269cb3d978655fb4f61f87d08a46af9854567.tar.xz | |
scsi: NCR5380: Add SCp members to struct NCR5380_cmd
This is necessary for the eventual removal of SCp from struct scsi_cmnd.
Link: https://lore.kernel.org/r/20220218195117.25689-9-bvanassche@acm.org
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: Ondrej Zary <linux@zary.sk>
Suggested-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/mac_scsi.c')
| -rw-r--r-- | drivers/scsi/mac_scsi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 71d493a0bb43..2e511697fce3 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -404,11 +404,12 @@ out: static int macscsi_dma_xfer_len(struct NCR5380_hostdata *hostdata, struct scsi_cmnd *cmd) { - if (hostdata->flags & FLAG_NO_PSEUDO_DMA || - cmd->SCp.this_residual < setup_use_pdma) + int resid = NCR5380_to_ncmd(cmd)->this_residual; + + if (hostdata->flags & FLAG_NO_PSEUDO_DMA || resid < setup_use_pdma) return 0; - return cmd->SCp.this_residual; + return resid; } static int macscsi_dma_residual(struct NCR5380_hostdata *hostdata) |