cxgb3 sparse warning fixes

Fix warnings from sparse related to shadowed variables and routines
that should be declared static.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 22 insertions, 22 deletions

diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 1c8eec38bde3..bd25421bc12a 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -222,32 +222,32 @@ static int cxgb_rdma_ctl(struct adapter *adapter, unsigned int req, void *data)
         int ret = 0;
 
         switch (req) {
-        case RDMA_GET_PARAMS:{
-                struct rdma_info *req = data;
+        case RDMA_GET_PARAMS: {
+                struct rdma_info *rdma = data;
                 struct pci_dev *pdev = adapter->pdev;
 
-                req->udbell_physbase = pci_resource_start(pdev, 2);
-                req->udbell_len = pci_resource_len(pdev, 2);
-                req->tpt_base =
+                rdma->udbell_physbase = pci_resource_start(pdev, 2);
+                rdma->udbell_len = pci_resource_len(pdev, 2);
+                rdma->tpt_base =
                         t3_read_reg(adapter, A_ULPTX_TPT_LLIMIT);
-                req->tpt_top = t3_read_reg(adapter, A_ULPTX_TPT_ULIMIT);
-                req->pbl_base =
+                rdma->tpt_top = t3_read_reg(adapter, A_ULPTX_TPT_ULIMIT);
+                rdma->pbl_base =
                         t3_read_reg(adapter, A_ULPTX_PBL_LLIMIT);
-                req->pbl_top = t3_read_reg(adapter, A_ULPTX_PBL_ULIMIT);
-                req->rqt_base = t3_read_reg(adapter, A_ULPRX_RQ_LLIMIT);
-                req->rqt_top = t3_read_reg(adapter, A_ULPRX_RQ_ULIMIT);
-                req->kdb_addr = adapter->regs + A_SG_KDOORBELL;
-                req->pdev = pdev;
+                rdma->pbl_top = t3_read_reg(adapter, A_ULPTX_PBL_ULIMIT);
+                rdma->rqt_base = t3_read_reg(adapter, A_ULPRX_RQ_LLIMIT);
+                rdma->rqt_top = t3_read_reg(adapter, A_ULPRX_RQ_ULIMIT);
+                rdma->kdb_addr = adapter->regs + A_SG_KDOORBELL;
+                rdma->pdev = pdev;
                 break;
         }
         case RDMA_CQ_OP:{
                 unsigned long flags;
-                struct rdma_cq_op *req = data;
+                struct rdma_cq_op *rdma = data;
 
                 /* may be called in any context */
                 spin_lock_irqsave(&adapter->sge.reg_lock, flags);
-                ret = t3_sge_cqcntxt_op(adapter, req->id, req->op,
-                                        req->credits);
+                ret = t3_sge_cqcntxt_op(adapter, rdma->id, rdma->op,
+                                        rdma->credits);
                 spin_unlock_irqrestore(&adapter->sge.reg_lock, flags);
                 break;
         }
@@ -274,15 +274,15 @@ static int cxgb_rdma_ctl(struct adapter *adapter, unsigned int req, void *data)
                 break;
         }
         case RDMA_CQ_SETUP:{
-                struct rdma_cq_setup *req = data;
+                struct rdma_cq_setup *rdma = data;
 
                 spin_lock_irq(&adapter->sge.reg_lock);
                 ret =
-                        t3_sge_init_cqcntxt(adapter, req->id,
-                                        req->base_addr, req->size,
+                        t3_sge_init_cqcntxt(adapter, rdma->id,
+                                        rdma->base_addr, rdma->size,
                                         ASYNC_NOTIF_RSPQ,
-                                        req->ovfl_mode, req->credits,
-                                        req->credit_thres);
+                                        rdma->ovfl_mode, rdma->credits,
+                                        rdma->credit_thres);
                 spin_unlock_irq(&adapter->sge.reg_lock);
                 break;
         }
@@ -292,13 +292,13 @@ static int cxgb_rdma_ctl(struct adapter *adapter, unsigned int req, void *data)
                 spin_unlock_irq(&adapter->sge.reg_lock);
                 break;
         case RDMA_CTRL_QP_SETUP:{
-                struct rdma_ctrlqp_setup *req = data;
+                struct rdma_ctrlqp_setup *rdma = data;
 
                 spin_lock_irq(&adapter->sge.reg_lock);
                 ret = t3_sge_init_ecntxt(adapter, FW_RI_SGEEC_START, 0,
                                                 SGE_CNTXT_RDMA,
                                                 ASYNC_NOTIF_RSPQ,
-                                                req->base_addr, req->size,
+                                                rdma->base_addr, rdma->size,
                                                 FW_RI_TID_START, 1, 0);
                 spin_unlock_irq(&adapter->sge.reg_lock);
                 break;