From 2e74c73c9837171c380f4c2ce4c749a0b62e4b8c Mon Sep 17 00:00:00 2001 From: Mateusz Kulikowski Date: Mon, 19 Oct 2015 22:00:17 +0200 Subject: [PATCH] staging: rtl8192e: cmdpkt: Simplify argument names Rename: codevirtualaddress -> data buffer_len -> len packettype -> type Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- .../staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 17 ++++++++--------- .../staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 3 +-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c index d74d0386bbaa..e602604867af 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c @@ -17,8 +17,7 @@ #include "r8192E_hw.h" #include "r8192E_cmdpkt.h" -bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, - u32 packettype, u32 buffer_len) +bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *data, u32 type, u32 len) { bool rt_status = true; @@ -33,17 +32,17 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, struct tx_fwinfo_8190pci *pTxFwInfo = NULL; - RT_TRACE(COMP_CMDPKT, "%s(),buffer_len is %d\n", __func__, buffer_len); + RT_TRACE(COMP_CMDPKT, "%s(),buffer_len is %d\n", __func__, len); rtl92e_init_fw_param(dev); frag_threshold = pfirmware->cmdpacket_frag_thresold; do { - if ((buffer_len - frag_offset) > frag_threshold) { + if ((len - frag_offset) > frag_threshold) { frag_length = frag_threshold; bLastIniPkt = 0; } else { - frag_length = (u16)(buffer_len - frag_offset); + frag_length = (u16)(len - frag_offset); bLastIniPkt = 1; } @@ -58,7 +57,7 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev)); tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); tcb_desc->queue_index = TXCMD_QUEUE; - tcb_desc->bCmdOrInit = packettype; + tcb_desc->bCmdOrInit = type; tcb_desc->bLastIniPkt = bLastIniPkt; tcb_desc->pkt_size = frag_length; @@ -68,14 +67,14 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, memset(pTxFwInfo, 0x12, 8); seg_ptr = skb_put(skb, frag_length); - memcpy(seg_ptr, code_virtual_address, (u32)frag_length); + memcpy(seg_ptr, data, (u32)frag_length); priv->rtllib->softmac_hard_start_xmit(skb, dev); - code_virtual_address += frag_length; + data += frag_length; frag_offset += frag_length; - } while (frag_offset < buffer_len); + } while (frag_offset < len); rtl92e_writeb(dev, TPPoll, TPPoll_CQ); Failed: diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h index 31303a14c7fb..1acf09933e8e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h @@ -15,6 +15,5 @@ #ifndef R819XUSB_CMDPKT_H #define R819XUSB_CMDPKT_H -bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *codevirtualaddress, - u32 packettype, u32 buffer_len); +bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *data, u32 type, u32 len); #endif -- 2.34.1