提交 e2bb5548 编写于 作者: B Bart Van Assche 提交者: Jens Axboe

skd: Remove several local variables

This patch does not change any functionality but makes the code
more brief.
Signed-off-by: NBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: NJens Axboe <axboe@kernel.dk>
上级 a3db102d
...@@ -44,12 +44,6 @@ ...@@ -44,12 +44,6 @@
static int skd_dbg_level; static int skd_dbg_level;
static int skd_isr_comp_limit = 4; static int skd_isr_comp_limit = 4;
enum {
SKD_FLUSH_INITIALIZER,
SKD_FLUSH_ZERO_SIZE_FIRST,
SKD_FLUSH_DATA_SECOND,
};
#define SKD_ASSERT(expr) \ #define SKD_ASSERT(expr) \
do { \ do { \
if (unlikely(!(expr))) { \ if (unlikely(!(expr))) { \
...@@ -497,31 +491,15 @@ static void skd_process_request(struct request *req, bool last) ...@@ -497,31 +491,15 @@ static void skd_process_request(struct request *req, bool last)
struct skd_request_context *const skreq = blk_mq_rq_to_pdu(req); struct skd_request_context *const skreq = blk_mq_rq_to_pdu(req);
struct skd_scsi_request *scsi_req; struct skd_scsi_request *scsi_req;
unsigned long flags; unsigned long flags;
unsigned long io_flags; const u32 lba = blk_rq_pos(req);
u32 lba; const u32 count = blk_rq_sectors(req);
u32 count; const int data_dir = rq_data_dir(req);
int data_dir;
__be64 be_dmaa;
int flush, fua;
WARN_ONCE(tag >= skd_max_queue_depth, "%#x > %#x (nr_requests = %lu)\n", WARN_ONCE(tag >= skd_max_queue_depth, "%#x > %#x (nr_requests = %lu)\n",
tag, skd_max_queue_depth, q->nr_requests); tag, skd_max_queue_depth, q->nr_requests);
SKD_ASSERT(skreq->state == SKD_REQ_STATE_IDLE); SKD_ASSERT(skreq->state == SKD_REQ_STATE_IDLE);
flush = fua = 0;
lba = (u32)blk_rq_pos(req);
count = blk_rq_sectors(req);
data_dir = rq_data_dir(req);
io_flags = req->cmd_flags;
if (req_op(req) == REQ_OP_FLUSH)
flush++;
if (io_flags & REQ_FUA)
fua++;
dev_dbg(&skdev->pdev->dev, dev_dbg(&skdev->pdev->dev,
"new req=%p lba=%u(0x%x) count=%u(0x%x) dir=%d\n", req, lba, "new req=%p lba=%u(0x%x) count=%u(0x%x) dir=%d\n", req, lba,
lba, count, count, data_dir); lba, count, count, data_dir);
...@@ -568,19 +546,18 @@ static void skd_process_request(struct request *req, bool last) ...@@ -568,19 +546,18 @@ static void skd_process_request(struct request *req, bool last)
scsi_req = &skmsg->msg_buf->scsi[fmh->num_protocol_cmds_coalesced]; scsi_req = &skmsg->msg_buf->scsi[fmh->num_protocol_cmds_coalesced];
memset(scsi_req, 0, sizeof(*scsi_req)); memset(scsi_req, 0, sizeof(*scsi_req));
be_dmaa = cpu_to_be64(skreq->sksg_dma_address);
scsi_req->hdr.tag = skreq->id; scsi_req->hdr.tag = skreq->id;
scsi_req->hdr.sg_list_dma_address = be_dmaa; scsi_req->hdr.sg_list_dma_address =
cpu_to_be64(skreq->sksg_dma_address);
if (flush == SKD_FLUSH_ZERO_SIZE_FIRST) { if (req_op(req) == REQ_OP_FLUSH) {
skd_prep_zerosize_flush_cdb(scsi_req, skreq); skd_prep_zerosize_flush_cdb(scsi_req, skreq);
SKD_ASSERT(skreq->flush_cmd == 1); SKD_ASSERT(skreq->flush_cmd == 1);
} else { } else {
skd_prep_rw_cdb(scsi_req, data_dir, lba, count); skd_prep_rw_cdb(scsi_req, data_dir, lba, count);
} }
if (fua) if (req->cmd_flags & REQ_FUA)
scsi_req->cdb[1] |= SKD_FUA_NV; scsi_req->cdb[1] |= SKD_FUA_NV;
scsi_req->hdr.sg_list_len_bytes = cpu_to_be32(skreq->sg_byte_count); scsi_req->hdr.sg_list_len_bytes = cpu_to_be32(skreq->sg_byte_count);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册