diff options
author | Christoph Hellwig <hch@lst.de> | 2014-11-25 15:50:09 +0100 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-12-04 09:58:33 +0100 |
commit | ea6bb33e7f5f759e14806686321c1e78733c9f4d (patch) | |
tree | 6d900f598587fd78972abca59507514c22e318a9 /drivers | |
parent | e1c50738009d0ac7741dbc82145fffebc9bf12de (diff) | |
download | linux-stable-ea6bb33e7f5f759e14806686321c1e78733c9f4d.tar.gz linux-stable-ea6bb33e7f5f759e14806686321c1e78733c9f4d.tar.bz2 linux-stable-ea6bb33e7f5f759e14806686321c1e78733c9f4d.zip |
fc: FCP_PTA_SIMPLE is 0
Not need to have an if/else to either assign FCP_PTA_SIMPLE or 0
to a variable.
Btw, it seems we really should factor generating a fcp cmnd from
a scsi_cmnd into a common helper.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com
Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_io.c | 6 | ||||
-rw-r--r-- | drivers/scsi/csiostor/csio_scsi.c | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c index 4b56858c1df2..9ecca8504f60 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_io.c +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c @@ -1737,11 +1737,7 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req, fcp_cmnd->fc_pri_ta = 0; fcp_cmnd->fc_tm_flags = io_req->mp_req.tm_flags; fcp_cmnd->fc_flags = io_req->io_req_flags; - - if (sc_cmd->flags & SCMD_TAGGED) - fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE; - else - fcp_cmnd->fc_pri_ta = 0; + fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE; } static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req, diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 4d0b6ce55f20..6bd36c311bee 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -172,10 +172,7 @@ csio_scsi_fcp_cmnd(struct csio_ioreq *req, void *addr) fcp_cmnd->fc_cmdref = 0; memcpy(fcp_cmnd->fc_cdb, scmnd->cmnd, 16); - if (scmnd->flags & SCMD_TAGGED) - fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE; - else - fcp_cmnd->fc_pri_ta = 0; + fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE; fcp_cmnd->fc_dl = cpu_to_be32(scsi_bufflen(scmnd)); if (req->nsge) |