From 5a943e6ddb019839384a74cf7c5f5d06d12836fb Mon Sep 17 00:00:00 2001 From: Andrew Vasquez Date: Wed, 21 Nov 2012 02:40:33 -0500 Subject: [PATCH] --- yaml --- r: 343749 b: refs/heads/master c: 7e98df229e915fdc38451d6f2de94e0589793288 h: refs/heads/master i: 343747: 332e1f715a60c6d236a08a6e5947ef55cf97f906 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_iocb.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index df31486324bb..74a960234523 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53016ed32182e1829bcb48bab37af54a7a0c95e2 +refs/heads/master: 7e98df229e915fdc38451d6f2de94e0589793288 diff --git a/trunk/drivers/scsi/qla2xxx/qla_iocb.c b/trunk/drivers/scsi/qla2xxx/qla_iocb.c index b6104042b7ac..a481684479c1 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_iocb.c +++ b/trunk/drivers/scsi/qla2xxx/qla_iocb.c @@ -2748,7 +2748,6 @@ qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds) struct rsp_que *rsp; struct req_que *req; int rval = EXT_STATUS_OK; - device_reg_t __iomem *reg = ISP_QUE_REG(ha, vha->req->id); rval = QLA_SUCCESS; @@ -2786,15 +2785,7 @@ qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds) /* Check for room on request queue. */ if (req->cnt < req_cnt + 2) { - if (ha->mqenable) - cnt = RD_REG_DWORD(®->isp25mq.req_q_out); - else if (IS_QLA82XX(ha)) - cnt = RD_REG_DWORD(®->isp82.req_q_out); - else if (IS_FWI2_CAPABLE(ha)) - cnt = RD_REG_DWORD(®->isp24.req_q_out); - else - cnt = qla2x00_debounce_register( - ISP_REQ_Q_OUT(ha, ®->isp)); + cnt = RD_REG_DWORD_RELAXED(req->req_q_out); if (req->ring_index < cnt) req->cnt = cnt - req->ring_index;