1 files changed, 147 insertions, 146 deletions

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 583517ed56f0..20278b9d5edb 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -16,15 +16,16 @@
  */
 
 #include "be.h"
+#include "be_cmds.h"
 
-static void be_mcc_notify(struct be_ctrl_info *ctrl)
+static void be_mcc_notify(struct be_adapter *adapter)
 {
-        struct be_queue_info *mccq = &ctrl->mcc_obj.q;
+        struct be_queue_info *mccq = &adapter->mcc_obj.q;
         u32 val = 0;
 
         val |= mccq->id & DB_MCCQ_RING_ID_MASK;
         val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT;
-        iowrite32(val, ctrl->db + DB_MCCQ_OFFSET);
+        iowrite32(val, adapter->db + DB_MCCQ_OFFSET);
 }
 
 /* To check if valid bit is set, check the entire word as we don't know
@@ -47,7 +48,7 @@ static inline void be_mcc_compl_use(struct be_mcc_cq_entry *compl)
         compl->flags = 0;
 }
 
-static int be_mcc_compl_process(struct be_ctrl_info *ctrl,
+static int be_mcc_compl_process(struct be_adapter *adapter,
         struct be_mcc_cq_entry *compl)
 {
         u16 compl_status, extd_status;
@@ -70,11 +71,11 @@ static int be_mcc_compl_process(struct be_ctrl_info *ctrl,
 }
 
 /* Link state evt is a string of bytes; no need for endian swapping */
-static void be_async_link_state_process(struct be_ctrl_info *ctrl,
+static void be_async_link_state_process(struct be_adapter *adapter,
                 struct be_async_event_link_state *evt)
 {
-        ctrl->async_cb(ctrl->adapter_ctxt,
-                evt->port_link_status == ASYNC_EVENT_LINK_UP ? true : false);
+        be_link_status_update(adapter,
+                evt->port_link_status == ASYNC_EVENT_LINK_UP);
 }
 
 static inline bool is_link_state_evt(u32 trailer)
@@ -84,9 +85,9 @@ static inline bool is_link_state_evt(u32 trailer)
                                 ASYNC_EVENT_CODE_LINK_STATE);
 }
 
-static struct be_mcc_cq_entry *be_mcc_compl_get(struct be_ctrl_info *ctrl)
+static struct be_mcc_cq_entry *be_mcc_compl_get(struct be_adapter *adapter)
 {
-        struct be_queue_info *mcc_cq = &ctrl->mcc_obj.cq;
+        struct be_queue_info *mcc_cq = &adapter->mcc_obj.cq;
         struct be_mcc_cq_entry *compl = queue_tail_node(mcc_cq);
 
         if (be_mcc_compl_is_new(compl)) {
@@ -96,40 +97,40 @@ static struct be_mcc_cq_entry *be_mcc_compl_get(struct be_ctrl_info *ctrl)
         return NULL;
 }
 
-void be_process_mcc(struct be_ctrl_info *ctrl)
+void be_process_mcc(struct be_adapter *adapter)
 {
         struct be_mcc_cq_entry *compl;
         int num = 0;
 
-        spin_lock_bh(&ctrl->mcc_cq_lock);
-        while ((compl = be_mcc_compl_get(ctrl))) {
+        spin_lock_bh(&adapter->mcc_cq_lock);
+        while ((compl = be_mcc_compl_get(adapter))) {
                 if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
                         /* Interpret flags as an async trailer */
                         BUG_ON(!is_link_state_evt(compl->flags));
 
                         /* Interpret compl as a async link evt */
-                        be_async_link_state_process(ctrl,
+                        be_async_link_state_process(adapter,
                                 (struct be_async_event_link_state *) compl);
                 } else {
-                        be_mcc_compl_process(ctrl, compl);
-                        atomic_dec(&ctrl->mcc_obj.q.used);
+                        be_mcc_compl_process(adapter, compl);
+                        atomic_dec(&adapter->mcc_obj.q.used);
                 }
                 be_mcc_compl_use(compl);
                 num++;
         }
         if (num)
-                be_cq_notify(ctrl, ctrl->mcc_obj.cq.id, true, num);
-        spin_unlock_bh(&ctrl->mcc_cq_lock);
+                be_cq_notify(adapter, adapter->mcc_obj.cq.id, true, num);
+        spin_unlock_bh(&adapter->mcc_cq_lock);
 }
 
 /* Wait till no more pending mcc requests are present */
-static void be_mcc_wait_compl(struct be_ctrl_info *ctrl)
+static void be_mcc_wait_compl(struct be_adapter *adapter)
 {
 #define mcc_timeout             50000 /* 5s timeout */
         int i;
         for (i = 0; i < mcc_timeout; i++) {
-                be_process_mcc(ctrl);
-                if (atomic_read(&ctrl->mcc_obj.q.used) == 0)
+                be_process_mcc(adapter);
+                if (atomic_read(&adapter->mcc_obj.q.used) == 0)
                         break;
                 udelay(100);
         }
@@ -138,10 +139,10 @@ static void be_mcc_wait_compl(struct be_ctrl_info *ctrl)
 }
 
 /* Notify MCC requests and wait for completion */
-static void be_mcc_notify_wait(struct be_ctrl_info *ctrl)
+static void be_mcc_notify_wait(struct be_adapter *adapter)
 {
-        be_mcc_notify(ctrl);
-        be_mcc_wait_compl(ctrl);
+        be_mcc_notify(adapter);
+        be_mcc_wait_compl(adapter);
 }
 
 static int be_mbox_db_ready_wait(void __iomem *db)
@@ -173,12 +174,12 @@ static int be_mbox_db_ready_wait(void __iomem *db)
  * Insert the mailbox address into the doorbell in two steps
  * Polls on the mbox doorbell till a command completion (or a timeout) occurs
  */
-static int be_mbox_db_ring(struct be_ctrl_info *ctrl)
+static int be_mbox_db_ring(struct be_adapter *adapter)
 {
         int status;
         u32 val = 0;
-        void __iomem *db = ctrl->db + MPU_MAILBOX_DB_OFFSET;
-        struct be_dma_mem *mbox_mem = &ctrl->mbox_mem;
+        void __iomem *db = adapter->db + MPU_MAILBOX_DB_OFFSET;
+        struct be_dma_mem *mbox_mem = &adapter->mbox_mem;
         struct be_mcc_mailbox *mbox = mbox_mem->va;
         struct be_mcc_cq_entry *cqe = &mbox->cqe;
 
@@ -208,7 +209,7 @@ static int be_mbox_db_ring(struct be_ctrl_info *ctrl)
 
         /* A cq entry has been made now */
         if (be_mcc_compl_is_new(cqe)) {
-                status = be_mcc_compl_process(ctrl, &mbox->cqe);
+                status = be_mcc_compl_process(adapter, &mbox->cqe);
                 be_mcc_compl_use(cqe);
                 if (status)
                         return status;
@@ -219,9 +220,9 @@ static int be_mbox_db_ring(struct be_ctrl_info *ctrl)
         return 0;
 }
 
-static int be_POST_stage_get(struct be_ctrl_info *ctrl, u16 *stage)
+static int be_POST_stage_get(struct be_adapter *adapter, u16 *stage)
 {
-        u32 sem = ioread32(ctrl->csr + MPU_EP_SEMAPHORE_OFFSET);
+        u32 sem = ioread32(adapter->csr + MPU_EP_SEMAPHORE_OFFSET);
 
         *stage = sem & EP_SEMAPHORE_POST_STAGE_MASK;
         if ((sem >> EP_SEMAPHORE_POST_ERR_SHIFT) & EP_SEMAPHORE_POST_ERR_MASK)
@@ -230,11 +231,11 @@ static int be_POST_stage_get(struct be_ctrl_info *ctrl, u16 *stage)
                 return 0;
 }
 
-static int be_POST_stage_poll(struct be_ctrl_info *ctrl, u16 poll_stage)
+static int be_POST_stage_poll(struct be_adapter *adapter, u16 poll_stage)
 {
         u16 stage, cnt, error;
         for (cnt = 0; cnt < 5000; cnt++) {
-                error = be_POST_stage_get(ctrl, &stage);
+                error = be_POST_stage_get(adapter, &stage);
                 if (error)
                         return -1;
 
@@ -248,11 +249,11 @@ static int be_POST_stage_poll(struct be_ctrl_info *ctrl, u16 poll_stage)
 }
 
 
-int be_cmd_POST(struct be_ctrl_info *ctrl)
+int be_cmd_POST(struct be_adapter *adapter)
 {
         u16 stage, error;
 
-        error = be_POST_stage_get(ctrl, &stage);
+        error = be_POST_stage_get(adapter, &stage);
         if (error)
                 goto err;
 
@@ -263,14 +264,14 @@ int be_cmd_POST(struct be_ctrl_info *ctrl)
                 goto err;
 
         /* On awaiting host rdy, reset and again poll on awaiting host rdy */
-        iowrite32(POST_STAGE_BE_RESET, ctrl->csr + MPU_EP_SEMAPHORE_OFFSET);
-        error = be_POST_stage_poll(ctrl, POST_STAGE_AWAITING_HOST_RDY);
+        iowrite32(POST_STAGE_BE_RESET, adapter->csr + MPU_EP_SEMAPHORE_OFFSET);
+        error = be_POST_stage_poll(adapter, POST_STAGE_AWAITING_HOST_RDY);
         if (error)
                 goto err;
 
         /* Now kickoff POST and poll on armfw ready */
-        iowrite32(POST_STAGE_HOST_RDY, ctrl->csr + MPU_EP_SEMAPHORE_OFFSET);
-        error = be_POST_stage_poll(ctrl, POST_STAGE_ARMFW_RDY);
+        iowrite32(POST_STAGE_HOST_RDY, adapter->csr + MPU_EP_SEMAPHORE_OFFSET);
+        error = be_POST_stage_poll(adapter, POST_STAGE_ARMFW_RDY);
         if (error)
                 goto err;
 
@@ -367,16 +368,16 @@ static inline struct be_mcc_wrb *wrb_from_mcc(struct be_queue_info *mccq)
         return wrb;
 }
 
-int be_cmd_eq_create(struct be_ctrl_info *ctrl,
+int be_cmd_eq_create(struct be_adapter *adapter,
                 struct be_queue_info *eq, int eq_delay)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_eq_create *req = embedded_payload(wrb);
         struct be_cmd_resp_eq_create *resp = embedded_payload(wrb);
         struct be_dma_mem *q_mem = &eq->dma_mem;
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -387,7 +388,7 @@ int be_cmd_eq_create(struct be_ctrl_info *ctrl,
         req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
 
         AMAP_SET_BITS(struct amap_eq_context, func, req->context,
-                        ctrl->pci_func);
+                        adapter->pci_func);
         AMAP_SET_BITS(struct amap_eq_context, valid, req->context, 1);
         /* 4byte eqe*/
         AMAP_SET_BITS(struct amap_eq_context, size, req->context, 0);
@@ -399,24 +400,24 @@ int be_cmd_eq_create(struct be_ctrl_info *ctrl,
 
         be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 eq->id = le16_to_cpu(resp->eq_id);
                 eq->created = true;
         }
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_mac_addr_query(struct be_ctrl_info *ctrl, u8 *mac_addr,
+int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
                         u8 type, bool permanent, u32 if_handle)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_mac_query *req = embedded_payload(wrb);
         struct be_cmd_resp_mac_query *resp = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -432,22 +433,22 @@ int be_cmd_mac_addr_query(struct be_ctrl_info *ctrl, u8 *mac_addr,
                 req->permanent = 0;
         }
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status)
                 memcpy(mac_addr, resp->mac.addr, ETH_ALEN);
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_pmac_add(struct be_ctrl_info *ctrl, u8 *mac_addr,
+int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
                 u32 if_id, u32 *pmac_id)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_pmac_add *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -458,23 +459,23 @@ int be_cmd_pmac_add(struct be_ctrl_info *ctrl, u8 *mac_addr,
         req->if_id = cpu_to_le32(if_id);
         memcpy(req->mac_address, mac_addr, ETH_ALEN);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_pmac_add *resp = embedded_payload(wrb);
                 *pmac_id = le32_to_cpu(resp->pmac_id);
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_pmac_del(struct be_ctrl_info *ctrl, u32 if_id, u32 pmac_id)
+int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_pmac_del *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -485,24 +486,24 @@ int be_cmd_pmac_del(struct be_ctrl_info *ctrl, u32 if_id, u32 pmac_id)
         req->if_id = cpu_to_le32(if_id);
         req->pmac_id = cpu_to_le32(pmac_id);
 
-        status = be_mbox_db_ring(ctrl);
-        spin_unlock(&ctrl->mbox_lock);
+        status = be_mbox_db_ring(adapter);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
 
-int be_cmd_cq_create(struct be_ctrl_info *ctrl,
+int be_cmd_cq_create(struct be_adapter *adapter,
                 struct be_queue_info *cq, struct be_queue_info *eq,
                 bool sol_evts, bool no_delay, int coalesce_wm)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_cq_create *req = embedded_payload(wrb);
         struct be_cmd_resp_cq_create *resp = embedded_payload(wrb);
         struct be_dma_mem *q_mem = &cq->dma_mem;
         void *ctxt = &req->context;
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -521,17 +522,17 @@ int be_cmd_cq_create(struct be_ctrl_info *ctrl,
         AMAP_SET_BITS(struct amap_cq_context, eventable, ctxt, 1);
         AMAP_SET_BITS(struct amap_cq_context, eqid, ctxt, eq->id);
         AMAP_SET_BITS(struct amap_cq_context, armed, ctxt, 1);
-        AMAP_SET_BITS(struct amap_cq_context, func, ctxt, ctrl->pci_func);
+        AMAP_SET_BITS(struct amap_cq_context, func, ctxt, adapter->pci_func);
         be_dws_cpu_to_le(ctxt, sizeof(req->context));
 
         be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 cq->id = le16_to_cpu(resp->cq_id);
                 cq->created = true;
         }
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -544,17 +545,17 @@ static u32 be_encoded_q_len(int q_len)
         return len_encoded;
 }
 
-int be_cmd_mccq_create(struct be_ctrl_info *ctrl,
+int be_cmd_mccq_create(struct be_adapter *adapter,
                         struct be_queue_info *mccq,
                         struct be_queue_info *cq)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_mcc_create *req = embedded_payload(wrb);
         struct be_dma_mem *q_mem = &mccq->dma_mem;
         void *ctxt = &req->context;
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -564,7 +565,7 @@ int be_cmd_mccq_create(struct be_ctrl_info *ctrl,
 
         req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);
 
-        AMAP_SET_BITS(struct amap_mcc_context, fid, ctxt, ctrl->pci_func);
+        AMAP_SET_BITS(struct amap_mcc_context, fid, ctxt, adapter->pci_func);
         AMAP_SET_BITS(struct amap_mcc_context, valid, ctxt, 1);
         AMAP_SET_BITS(struct amap_mcc_context, ring_size, ctxt,
                 be_encoded_q_len(mccq->len));
@@ -574,29 +575,29 @@ int be_cmd_mccq_create(struct be_ctrl_info *ctrl,
 
         be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_mcc_create *resp = embedded_payload(wrb);
                 mccq->id = le16_to_cpu(resp->id);
                 mccq->created = true;
         }
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
 
-int be_cmd_txq_create(struct be_ctrl_info *ctrl,
+int be_cmd_txq_create(struct be_adapter *adapter,
                         struct be_queue_info *txq,
                         struct be_queue_info *cq)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_eth_tx_create *req = embedded_payload(wrb);
         struct be_dma_mem *q_mem = &txq->dma_mem;
         void *ctxt = &req->context;
         int status;
         u32 len_encoded;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -613,7 +614,7 @@ int be_cmd_txq_create(struct be_ctrl_info *ctrl,
                 len_encoded = 0;
         AMAP_SET_BITS(struct amap_tx_context, tx_ring_size, ctxt, len_encoded);
         AMAP_SET_BITS(struct amap_tx_context, pci_func_id, ctxt,
-                        ctrl->pci_func);
+                        adapter->pci_func);
         AMAP_SET_BITS(struct amap_tx_context, ctx_valid, ctxt, 1);
         AMAP_SET_BITS(struct amap_tx_context, cq_id_send, ctxt, cq->id);
 
@@ -621,27 +622,27 @@ int be_cmd_txq_create(struct be_ctrl_info *ctrl,
 
         be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_eth_tx_create *resp = embedded_payload(wrb);
                 txq->id = le16_to_cpu(resp->cid);
                 txq->created = true;
         }
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
 
-int be_cmd_rxq_create(struct be_ctrl_info *ctrl,
+int be_cmd_rxq_create(struct be_adapter *adapter,
                 struct be_queue_info *rxq, u16 cq_id, u16 frag_size,
                 u16 max_frame_size, u32 if_id, u32 rss)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_eth_rx_create *req = embedded_payload(wrb);
         struct be_dma_mem *q_mem = &rxq->dma_mem;
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -657,27 +658,27 @@ int be_cmd_rxq_create(struct be_ctrl_info *ctrl,
         req->max_frame_size = cpu_to_le16(max_frame_size);
         req->rss_queue = cpu_to_le32(rss);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_eth_rx_create *resp = embedded_payload(wrb);
                 rxq->id = le16_to_cpu(resp->id);
                 rxq->created = true;
         }
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
 
 /* Generic destroyer function for all types of queues */
-int be_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
+int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
                 int queue_type)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_q_destroy *req = embedded_payload(wrb);
         u8 subsys = 0, opcode = 0;
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
 
         memset(wrb, 0, sizeof(*wrb));
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -711,22 +712,22 @@ int be_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
         be_cmd_hdr_prepare(&req->hdr, subsys, opcode, sizeof(*req));
         req->id = cpu_to_le16(q->id);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
 err:
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
 
 /* Create an rx filtering policy configuration on an i/f */
-int be_cmd_if_create(struct be_ctrl_info *ctrl, u32 flags, u8 *mac,
+int be_cmd_if_create(struct be_adapter *adapter, u32 flags, u8 *mac,
                 bool pmac_invalid, u32 *if_handle, u32 *pmac_id)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_if_create *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -739,7 +740,7 @@ int be_cmd_if_create(struct be_ctrl_info *ctrl, u32 flags, u8 *mac,
         if (!pmac_invalid)
                 memcpy(req->mac_addr, mac, ETH_ALEN);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_if_create *resp = embedded_payload(wrb);
                 *if_handle = le32_to_cpu(resp->interface_id);
@@ -747,17 +748,17 @@ int be_cmd_if_create(struct be_ctrl_info *ctrl, u32 flags, u8 *mac,
                         *pmac_id = le32_to_cpu(resp->pmac_id);
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_if_destroy(struct be_ctrl_info *ctrl, u32 interface_id)
+int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_if_destroy *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -766,9 +767,9 @@ int be_cmd_if_destroy(struct be_ctrl_info *ctrl, u32 interface_id)
                 OPCODE_COMMON_NTWK_INTERFACE_DESTROY, sizeof(*req));
 
         req->interface_id = cpu_to_le32(interface_id);
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -776,14 +777,14 @@ int be_cmd_if_destroy(struct be_ctrl_info *ctrl, u32 interface_id)
 /* Get stats is a non embedded command: the request is not embedded inside
  * WRB but is a separate dma memory block
  */
-int be_cmd_get_stats(struct be_ctrl_info *ctrl, struct be_dma_mem *nonemb_cmd)
+int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_get_stats *req = nonemb_cmd->va;
         struct be_sge *sge = nonembedded_sgl(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         memset(req, 0, sizeof(*req));
@@ -796,24 +797,24 @@ int be_cmd_get_stats(struct be_ctrl_info *ctrl, struct be_dma_mem *nonemb_cmd)
         sge->pa_lo = cpu_to_le32(nonemb_cmd->dma & 0xFFFFFFFF);
         sge->len = cpu_to_le32(nonemb_cmd->size);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_get_stats *resp = nonemb_cmd->va;
                 be_dws_le_to_cpu(&resp->hw_stats, sizeof(resp->hw_stats));
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_link_status_query(struct be_ctrl_info *ctrl,
+int be_cmd_link_status_query(struct be_adapter *adapter,
                         bool *link_up)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_link_status *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
 
         *link_up = false;
         memset(wrb, 0, sizeof(*wrb));
@@ -823,24 +824,24 @@ int be_cmd_link_status_query(struct be_ctrl_info *ctrl,
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_NTWK_LINK_STATUS_QUERY, sizeof(*req));
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_link_status *resp = embedded_payload(wrb);
                 if (resp->mac_speed != PHY_LINK_SPEED_ZERO)
                         *link_up = true;
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_get_fw_ver(struct be_ctrl_info *ctrl, char *fw_ver)
+int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_get_fw_version *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -848,24 +849,24 @@ int be_cmd_get_fw_ver(struct be_ctrl_info *ctrl, char *fw_ver)
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_GET_FW_VERSION, sizeof(*req));
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb);
                 strncpy(fw_ver, resp->firmware_version_string, FW_VER_LEN);
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
 /* set the EQ delay interval of an EQ to specified value */
-int be_cmd_modify_eqd(struct be_ctrl_info *ctrl, u32 eq_id, u32 eqd)
+int be_cmd_modify_eqd(struct be_adapter *adapter, u32 eq_id, u32 eqd)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_modify_eq_delay *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -878,20 +879,20 @@ int be_cmd_modify_eqd(struct be_ctrl_info *ctrl, u32 eq_id, u32 eqd)
         req->delay[0].phase = 0;
         req->delay[0].delay_multiplier = cpu_to_le32(eqd);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_vlan_config(struct be_ctrl_info *ctrl, u32 if_id, u16 *vtag_array,
+int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array,
                         u32 num, bool untagged, bool promiscuous)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_vlan_config *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
         memset(wrb, 0, sizeof(*wrb));
 
         be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
@@ -908,21 +909,21 @@ int be_cmd_vlan_config(struct be_ctrl_info *ctrl, u32 if_id, u16 *vtag_array,
                         req->num_vlan * sizeof(vtag_array[0]));
         }
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
 /* Use MCC for this command as it may be called in BH context */
-int be_cmd_promiscuous_config(struct be_ctrl_info *ctrl, u8 port_num, bool en)
+int be_cmd_promiscuous_config(struct be_adapter *adapter, u8 port_num, bool en)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_promiscuous_config *req;
 
-        spin_lock_bh(&ctrl->mcc_lock);
+        spin_lock_bh(&adapter->mcc_lock);
 
-        wrb = wrb_from_mcc(&ctrl->mcc_obj.q);
+        wrb = wrb_from_mcc(&adapter->mcc_obj.q);
         BUG_ON(!wrb);
 
         req = embedded_payload(wrb);
@@ -937,9 +938,9 @@ int be_cmd_promiscuous_config(struct be_ctrl_info *ctrl, u8 port_num, bool en)
         else
                 req->port0_promiscuous = en;
 
-        be_mcc_notify_wait(ctrl);
+        be_mcc_notify_wait(adapter);
 
-        spin_unlock_bh(&ctrl->mcc_lock);
+        spin_unlock_bh(&adapter->mcc_lock);
         return 0;
 }
 
@@ -947,16 +948,16 @@ int be_cmd_promiscuous_config(struct be_ctrl_info *ctrl, u8 port_num, bool en)
  * Use MCC for this command as it may be called in BH context
  * (mc == NULL) => multicast promiscous
  */
-int be_cmd_multicast_set(struct be_ctrl_info *ctrl, u32 if_id,
+int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
                 struct dev_mc_list *mc_list, u32 mc_count)
 {
 #define BE_MAX_MC               32 /* set mcast promisc if > 32 */
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_mcast_mac_config *req;
 
-        spin_lock_bh(&ctrl->mcc_lock);
+        spin_lock_bh(&adapter->mcc_lock);
 
-        wrb = wrb_from_mcc(&ctrl->mcc_obj.q);
+        wrb = wrb_from_mcc(&adapter->mcc_obj.q);
         BUG_ON(!wrb);
 
         req = embedded_payload(wrb);
@@ -979,20 +980,20 @@ int be_cmd_multicast_set(struct be_ctrl_info *ctrl, u32 if_id,
                 req->promiscuous = 1;
         }
 
-        be_mcc_notify_wait(ctrl);
+        be_mcc_notify_wait(adapter);
 
-        spin_unlock_bh(&ctrl->mcc_lock);
+        spin_unlock_bh(&adapter->mcc_lock);
 
         return 0;
 }
 
-int be_cmd_set_flow_control(struct be_ctrl_info *ctrl, u32 tx_fc, u32 rx_fc)
+int be_cmd_set_flow_control(struct be_adapter *adapter, u32 tx_fc, u32 rx_fc)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_set_flow_control *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
 
         memset(wrb, 0, sizeof(*wrb));
 
@@ -1004,19 +1005,19 @@ int be_cmd_set_flow_control(struct be_ctrl_info *ctrl, u32 tx_fc, u32 rx_fc)
         req->tx_flow_control = cpu_to_le16((u16)tx_fc);
         req->rx_flow_control = cpu_to_le16((u16)rx_fc);
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_get_flow_control(struct be_ctrl_info *ctrl, u32 *tx_fc, u32 *rx_fc)
+int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_get_flow_control *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
 
         memset(wrb, 0, sizeof(*wrb));
 
@@ -1025,7 +1026,7 @@ int be_cmd_get_flow_control(struct be_ctrl_info *ctrl, u32 *tx_fc, u32 *rx_fc)
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_GET_FLOW_CONTROL, sizeof(*req));
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_get_flow_control *resp =
                                                 embedded_payload(wrb);
@@ -1033,17 +1034,17 @@ int be_cmd_get_flow_control(struct be_ctrl_info *ctrl, u32 *tx_fc, u32 *rx_fc)
                 *rx_fc = le16_to_cpu(resp->rx_flow_control);
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }
 
-int be_cmd_query_fw_cfg(struct be_ctrl_info *ctrl, u32 *port_num)
+int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num)
 {
-        struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+        struct be_mcc_wrb *wrb = wrb_from_mbox(&adapter->mbox_mem);
         struct be_cmd_req_query_fw_cfg *req = embedded_payload(wrb);
         int status;
 
-        spin_lock(&ctrl->mbox_lock);
+        spin_lock(&adapter->mbox_lock);
 
         memset(wrb, 0, sizeof(*wrb));
 
@@ -1052,12 +1053,12 @@ int be_cmd_query_fw_cfg(struct be_ctrl_info *ctrl, u32 *port_num)
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_QUERY_FIRMWARE_CONFIG, sizeof(*req));
 
-        status = be_mbox_db_ring(ctrl);
+        status = be_mbox_db_ring(adapter);
         if (!status) {
                 struct be_cmd_resp_query_fw_cfg *resp = embedded_payload(wrb);
                 *port_num = le32_to_cpu(resp->phys_port);
         }
 
-        spin_unlock(&ctrl->mbox_lock);
+        spin_unlock(&adapter->mbox_lock);
         return status;
 }