[PATCH] staging: rtl8712: recv_linux.c: Align * on block comment
From: Christian L Moreno Block comments should align the * on each line. This warning was reported by checkpatch.pl Signed-off-by: Christian L Moreno --- drivers/staging/rtl8712/recv_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c index 84c4c8580f9a..70a4dcd4a1e5 100644 --- a/drivers/staging/rtl8712/recv_linux.c +++ b/drivers/staging/rtl8712/recv_linux.c @@ -115,8 +115,8 @@ void r8712_recv_indicatepkt(struct _adapter *adapter, skb->protocol = eth_type_trans(skb, adapter->pnetdev); netif_rx(skb); recvframe->u.hdr.pkt = NULL; /* pointers to NULL before - * r8712_free_recvframe() - */ + * r8712_free_recvframe() + */ r8712_free_recvframe(recvframe, free_recv_queue); return; _recv_indicatepkt_drop: -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: rtl871x_xmit.c: Fix some CHECK and WARNING
From: Christian Luciano Moreno Fix: line over 80 characters space unnecesary after cast alignment match open parenthesis comparison to NULL Those warnings and check were reported by checkpatch. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/rtl871x_xmit.c | 100 - 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index f6fe8ea12961..716a0eebdcbd 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -22,7 +22,6 @@ #include "osdep_intf.h" #include "usb_ops.h" - static const u8 P802_1H_OUI[P80211_OUI_LEN] = {0x00, 0x00, 0xf8}; static const u8 RFC1042_OUI[P80211_OUI_LEN] = {0x00, 0x00, 0x00}; static void init_hwxmits(struct hw_xmit *phwxmit, sint entry); @@ -39,7 +38,7 @@ static void _init_txservq(struct tx_servq *ptxservq) void _r8712_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv) { memset((unsigned char *)psta_xmitpriv, 0, -sizeof(struct sta_xmit_priv)); + sizeof(struct sta_xmit_priv)); spin_lock_init(&psta_xmitpriv->lock); _init_txservq(&psta_xmitpriv->be_q); _init_txservq(&psta_xmitpriv->bk_q); @@ -71,19 +70,21 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, _init_queue(&pxmitpriv->apsd_queue); _init_queue(&pxmitpriv->free_xmit_queue); /* -* Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME, +* Please allocate memory with the +* sz = (struct xmit_frame) * NR_XMITFRAME, * and initialize free_xmit_frame below. * Please also apply free_txobj to link_up all the xmit_frames... */ pxmitpriv->pallocated_frame_buf = - kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4, GFP_ATOMIC); + kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4, + GFP_ATOMIC); if (!pxmitpriv->pallocated_frame_buf) { pxmitpriv->pxmit_frame_buf = NULL; return _FAIL; } pxmitpriv->pxmit_frame_buf = pxmitpriv->pallocated_frame_buf + 4 - - ((addr_t) (pxmitpriv->pallocated_frame_buf) & 3); - pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf; + ((addr_t)(pxmitpriv->pallocated_frame_buf) & 3); + pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf; for (i = 0; i < NR_XMITFRAME; i++) { INIT_LIST_HEAD(&(pxframe->list)); pxframe->padapter = padapter; @@ -92,7 +93,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, pxframe->buf_addr = NULL; pxframe->pxmitbuf = NULL; list_add_tail(&(pxframe->list), -&(pxmitpriv->free_xmit_queue.queue)); + &(pxmitpriv->free_xmit_queue.queue)); pxframe++; } pxmitpriv->free_xmitframe_cnt = NR_XMITFRAME; @@ -126,16 +127,16 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; for (i = 0; i < NR_XMITBUFF; i++) { INIT_LIST_HEAD(&pxmitbuf->list); - pxmitbuf->pallocated_buf = kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ, - GFP_ATOMIC); + pxmitbuf->pallocated_buf = + kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ, GFP_ATOMIC); if (!pxmitbuf->pallocated_buf) return _FAIL; pxmitbuf->pbuf = pxmitbuf->pallocated_buf + XMITBUF_ALIGN_SZ - -((addr_t) (pxmitbuf->pallocated_buf) & +((addr_t)(pxmitbuf->pallocated_buf) & (XMITBUF_ALIGN_SZ - 1)); r8712_xmit_resource_alloc(padapter, pxmitbuf); list_add_tail(&pxmitbuf->list, -&(pxmitpriv->free_xmitbuf_queue.queue)); + &(pxmitpriv->free_xmitbuf_queue.queue)); pxmitbuf++; } pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF; @@ -143,8 +144,8 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, alloc_hwxmits(padapter); init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); tasklet_init(&pxmitpriv->xmit_tasklet, - (void(*)(unsigned long))r8712_xmit_bh, - (unsigned long)padapter); +(void(*)(unsigned long))r8712_xmit_bh, +(unsigned long)padapter); return _SUCCESS; } @@ -156,7 +157,7 @@ void _free_xmit_priv(struct xmit_priv *pxmitpriv) pxmitpriv->pxmit_frame_buf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; - if (px
[PATCH] staging: rtl8712: rtl871x_xmit.h: Fix alignment code
From: Christian Luciano Moreno Align code to match open parenthesis and tabs before statements. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/rtl871x_xmit.h | 30 +- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_xmit.h b/drivers/staging/rtl8712/rtl871x_xmit.h index 3bea2e374f13..888c6bb24587 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.h +++ b/drivers/staging/rtl8712/rtl871x_xmit.h @@ -41,8 +41,8 @@ do { \ pattrib_iv[0] = txpn._byte_.TSC0;\ pattrib_iv[1] = txpn._byte_.TSC1;\ pattrib_iv[2] = txpn._byte_.TSC2;\ - pattrib_iv[3] = ((keyidx & 0x3)<<6);\ - txpn.val = (txpn.val == 0xff) ? 0 : (txpn.val+1);\ + pattrib_iv[3] = ((keyidx & 0x3) << 6);\ + txpn.val = (txpn.val == 0xff) ? 0 : (txpn.val + 1);\ } while (0) /* Fixed the Big Endian bug when doing the Tx. @@ -53,13 +53,13 @@ do { \ pattrib_iv[0] = txpn._byte_.TSC1;\ pattrib_iv[1] = (txpn._byte_.TSC1 | 0x20) & 0x7f;\ pattrib_iv[2] = txpn._byte_.TSC0;\ - pattrib_iv[3] = BIT(5) | ((keyidx & 0x3)<<6);\ + pattrib_iv[3] = BIT(5) | ((keyidx & 0x3) << 6);\ pattrib_iv[4] = txpn._byte_.TSC2;\ pattrib_iv[5] = txpn._byte_.TSC3;\ pattrib_iv[6] = txpn._byte_.TSC4;\ pattrib_iv[7] = txpn._byte_.TSC5;\ txpn.val = txpn.val == 0xULL ? 0 : \ - (txpn.val+1);\ + (txpn.val + 1);\ } while (0) #define AES_IV(pattrib_iv, txpn, keyidx)\ @@ -67,13 +67,13 @@ do { \ pattrib_iv[0] = txpn._byte_.TSC0;\ pattrib_iv[1] = txpn._byte_.TSC1;\ pattrib_iv[2] = 0;\ - pattrib_iv[3] = BIT(5) | ((keyidx & 0x3)<<6);\ + pattrib_iv[3] = BIT(5) | ((keyidx & 0x3) << 6);\ pattrib_iv[4] = txpn._byte_.TSC2;\ pattrib_iv[5] = txpn._byte_.TSC3;\ pattrib_iv[6] = txpn._byte_.TSC4;\ pattrib_iv[7] = txpn._byte_.TSC5;\ txpn.val = txpn.val == 0xULL ? 0 : \ - (txpn.val+1);\ + (txpn.val + 1);\ } while (0) struct hw_xmit { @@ -148,8 +148,8 @@ struct xmit_frame { _pkt *pkt; int frame_tag; struct _adapter *padapter; -u8 *buf_addr; -struct xmit_buf *pxmitbuf; + u8 *buf_addr; + struct xmit_buf *pxmitbuf; u8 *mem_addr; u16 sz[8]; struct urb *pxmit_urb[8]; @@ -182,11 +182,11 @@ struct sta_xmit_priv { }; struct hw_txqueue { - /*volatile*/ sint head; - /*volatile*/ sint tail; - /*volatile*/ sint free_sz;/*in units of 64 bytes*/ - /*volatile*/ sint free_cmdsz; - /*volatile*/ sinttxsz[8]; + sinthead; /*volatile*/ + sinttail; /*volatile*/ + sintfree_sz;/*volatile*/ /*in units of 64 bytes*/ + sintfree_cmdsz; /*volatile*/ + sinttxsz[8];/*volatile*/ uintff_hwaddr; uintcmd_hwaddr; sintac_tag; @@ -259,7 +259,7 @@ void r8712_free_xmitframe(struct xmit_priv *pxmitpriv, void r8712_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue); sint r8712_xmit_classifier(struct _adapter *padapter, - struct xmit_frame *pxmitframe); + struct xmit_frame *pxmitframe); sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); sint _r8712_init_hw_txqueue(struct hw_txqueue *phw_txqueue, u8 ac_tag); @@ -280,7 +280,7 @@ int r8712_xmit_direct(struct _adapter *padapter, struct xmit_frame *pxmitframe); void r8712_xmit_bh(void *priv); void xmitframe_xmitbuf_attach(struct xmit_frame *pxmitframe, - struct xmit_buf *pxmitbuf); + struct xmit_buf *pxmitbuf); #include "rtl8712_xmit.h" -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: Align code with open parenthesis
From: Christian Luciano Moreno Fix 'CHECK: Alignment should match open parenthesis' reported by checkpatch. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/xmit_osdep.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8712/xmit_osdep.h b/drivers/staging/rtl8712/xmit_osdep.h index 21f6b31e0f50..b76021b568f8 100644 --- a/drivers/staging/rtl8712/xmit_osdep.h +++ b/drivers/staging/rtl8712/xmit_osdep.h @@ -37,16 +37,16 @@ struct xmit_buf; int r8712_xmit_entry(_pkt *pkt, struct net_device *pnetdev); void r8712_SetFilter(struct work_struct *work); int r8712_xmit_resource_alloc(struct _adapter *padapter, - struct xmit_buf *pxmitbuf); + struct xmit_buf *pxmitbuf); void r8712_xmit_resource_free(struct _adapter *padapter, - struct xmit_buf *pxmitbuf); + struct xmit_buf *pxmitbuf); void r8712_set_qos(struct pkt_file *ppktfile, - struct pkt_attrib *pattrib); + struct pkt_attrib *pattrib); void _r8712_open_pktfile(_pkt *pktptr, struct pkt_file *pfile); uint _r8712_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); sint r8712_endofpktfile(struct pkt_file *pfile); void r8712_xmit_complete(struct _adapter *padapter, -struct xmit_frame *pxframe); +struct xmit_frame *pxframe); #endif -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: Fix alignment with open parenthesis
From: Christian Luciano Moreno Fix 'CHECK: Alignment should match open parenthesis' reported by checkpatch. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/usb_ops.h | 9 + drivers/staging/rtl8712/usb_ops_linux.c | 13 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/usb_ops.h b/drivers/staging/rtl8712/usb_ops.h index d62975447d29..5e825dda49e5 100644 --- a/drivers/staging/rtl8712/usb_ops.h +++ b/drivers/staging/rtl8712/usb_ops.h @@ -21,9 +21,9 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem); u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, - u32 cnt, u8 *wmem); +u32 cnt, u8 *wmem); u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, -u32 cnt, u8 *rmem); + u32 cnt, u8 *rmem); void r8712_usb_set_intf_option(u32 *poption); void r8712_usb_set_intf_funs(struct intf_hdl *pintf_hdl); uint r8712_usb_init_intf_priv(struct intf_priv *pintfpriv); @@ -31,8 +31,9 @@ void r8712_usb_unload_intf_priv(struct intf_priv *pintfpriv); void r8712_usb_set_intf_ops(struct _io_ops *pops); void r8712_usb_read_port_cancel(struct _adapter *padapter); void r8712_usb_write_port_cancel(struct _adapter *padapter); -int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, - u16 index, void *pdata, u16 len, u8 requesttype); +int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, + u16 value, u16 index, void *pdata, + u16 len, u8 requesttype); #endif diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index 9d290bc2fdb7..5ba9ac6cb6b4 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -192,7 +192,7 @@ static void r8712_usb_read_port_complete(struct urb *purb) if ((purb->actual_length > (MAX_RECVBUF_SZ)) || (purb->actual_length < RXDESC_SIZE)) { r8712_read_port(padapter, precvpriv->ff_hwaddr, 0, - (unsigned char *)precvbuf); + (unsigned char *)precvbuf); } else { _pkt *pskb = precvbuf->pskb; @@ -228,7 +228,7 @@ static void r8712_usb_read_port_complete(struct urb *purb) /* Fall through. */ case -EPROTO: r8712_read_port(padapter, precvpriv->ff_hwaddr, 0, - (unsigned char *)precvbuf); + (unsigned char *)precvbuf); break; case -EINPROGRESS: netdev_err(padapter->pnetdev, "ERROR: URB IS IN PROGRESS!\n"); @@ -262,8 +262,9 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue); if (!precvbuf->pskb) { - precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, -MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); + precvbuf->pskb = + netdev_alloc_skb(adapter->pnetdev, +MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); if (!precvbuf->pskb) return _FAIL; tmpaddr = (addr_t)precvbuf->pskb->data; @@ -367,7 +368,7 @@ static void usb_write_port_complete(struct urb *purb) break; default: netdev_warn(padapter->pnetdev, - "r8712u: pipe error: (%d)\n", purb->status); + "r8712u: pipe error: (%d)\n", purb->status); break; } /* not to consider tx fragment */ @@ -467,7 +468,7 @@ void r8712_usb_write_port_cancel(struct _adapter *padapter) } int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, - u16 index, void *pdata, u16 len, u8 requesttype) + u16 index, void *pdata, u16 len, u8 requesttype) { unsigned int pipe; int status; -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: Fix alignment with open parenthesis
From: Christian Luciano Moreno Fix 'CHECK: Alignment should match open parenthesis' reported by checkpatch. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/usb_ops.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8712/usb_ops.c b/drivers/staging/rtl8712/usb_ops.c index eef52d5c730a..2fc33ee969b2 100644 --- a/drivers/staging/rtl8712/usb_ops.c +++ b/drivers/staging/rtl8712/usb_ops.c @@ -37,8 +37,8 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr) index = 0; wvalue = (u16)(addr & 0x); len = 1; - r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, &data, len, - requesttype); + r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, + &data, len, requesttype); return (u8)(le32_to_cpu(data) & 0x0ff); } @@ -57,8 +57,8 @@ static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr) index = 0; wvalue = (u16)(addr & 0x); len = 2; - r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, &data, len, - requesttype); + r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, + &data, len, requesttype); return (u16)(le32_to_cpu(data) & 0x); } @@ -77,8 +77,8 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr) index = 0; wvalue = (u16)(addr & 0x); len = 4; - r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, &data, len, - requesttype); + r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, + &data, len, requesttype); return le32_to_cpu(data); } @@ -98,8 +98,8 @@ static void usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val) wvalue = (u16)(addr & 0x); len = 1; data = cpu_to_le32((u32)val & 0x00ff); - r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, &data, len, - requesttype); + r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, + &data, len, requesttype); } static void usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val) @@ -118,8 +118,8 @@ static void usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val) wvalue = (u16)(addr & 0x); len = 2; data = cpu_to_le32((u32)val & 0x); - r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, &data, len, - requesttype); + r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, + &data, len, requesttype); } static void usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val) @@ -138,8 +138,8 @@ static void usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val) wvalue = (u16)(addr & 0x); len = 4; data = cpu_to_le32(val); - r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, &data, len, - requesttype); + r8712_usbctrl_vendorreq(pintfpriv, request, wvalue, index, + &data, len, requesttype); } void r8712_usb_set_intf_option(u32 *poption) -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: Fix CHECK reported by checkpatch
From: Christian Luciano Moreno Change local variable name to avoid CamelCase. Align code to the open parenthesis to fix alignment issues. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/rtl8712_efuse.c | 67 - 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c index 00babd011a62..62aad2f7259d 100644 --- a/drivers/staging/rtl8712/rtl8712_efuse.c +++ b/drivers/staging/rtl8712/rtl8712_efuse.c @@ -65,7 +65,7 @@ void r8712_efuse_reg_uninit(struct _adapter *padapter) static u8 efuse_one_byte_read(struct _adapter *padapter, u16 addr, u8 *data) { - u8 tmpidx = 0, bResult; + u8 tmpidx = 0, b_result; /* -e-fuse reg ctrl - */ r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ @@ -78,17 +78,17 @@ static u8 efuse_one_byte_read(struct _adapter *padapter, u16 addr, u8 *data) tmpidx++; if (tmpidx < 100) { *data = r8712_read8(padapter, EFUSE_CTRL); - bResult = true; + b_result = true; } else { *data = 0xff; - bResult = false; + b_result = false; } - return bResult; + return b_result; } static u8 efuse_one_byte_write(struct _adapter *padapter, u16 addr, u8 data) { - u8 tmpidx = 0, bResult; + u8 tmpidx = 0, b_result; /* -e-fuse reg ctrl */ r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ @@ -101,16 +101,16 @@ static u8 efuse_one_byte_write(struct _adapter *padapter, u16 addr, u8 data) (tmpidx < 100)) tmpidx++; if (tmpidx < 100) - bResult = true; + b_result = true; else - bResult = false; - return bResult; + b_result = false; + return b_result; } static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr, u8 *data) { - u8 tmpidx = 0, tmpv8 = 0, bResult; + u8 tmpidx = 0, tmpv8 = 0, b_result; /* -e-fuse reg ctrl - */ r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ @@ -124,10 +124,10 @@ static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr, tmpidx++; if (tmpidx < 100) { *data = r8712_read8(padapter, EFUSE_CTRL); - bResult = true; + b_result = true; } else { *data = 0; - bResult = false; + b_result = false; } } else { r8712_write8(padapter, EFUSE_CTRL, *data); /* data */ @@ -136,11 +136,11 @@ static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr, (tmpidx < 100)) tmpidx++; if (tmpidx < 100) - bResult = true; + b_result = true; else - bResult = false; + b_result = false; } - return bResult; + return b_result; } static u8 efuse_is_empty(struct _adapter *padapter, u8 *empty) @@ -208,20 +208,21 @@ static void pgpacket_copy_data(const u8 word_en, const u8 *sourdata, u16 r8712_efuse_get_current_size(struct _adapter *padapter) { - int bContinual = true; + int b_continual = true; u16 efuse_addr = 0; u8 hworden = 0; u8 efuse_data, word_cnts = 0; - while (bContinual && efuse_one_byte_read(padapter, efuse_addr, - &efuse_data) && (efuse_addr < efuse_available_max_size)) { + while (b_continual && + efuse_one_byte_read(padapter, efuse_addr, &efuse_data) && + (efuse_addr < efuse_available_max_size)) { if (efuse_data != 0xFF) { hworden = efuse_data & 0x0F; word_cnts = calculate_word_cnts(hworden); /* read next header */ efuse_addr = efuse_addr + (word_cnts * 2) + 1; } else { - bContinual = false; + b_continual = false; } } return efuse_addr; @@ -300,18 +301,16 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr) for (i = 0; i < PGPKG_MAX_WORDS; i++) { if (BIT(i) & word_en) { if (BIT(i) & pkt.word_en) { - if (efuse_one_byte_read( - padapter, addr, -
[PATCH] staging: rtl8712: Delete multiple blank line.
From: Christian Luciano Moreno Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h b/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h index e125c7222ab5..68bdec07f51e 100644 --- a/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h @@ -91,6 +91,5 @@ #define_BCNSPACE_MSK 0x0FFF #define_BCNSPACE_SHT 0 - #endif /* __RTL8712_CMDCTRL_BITDEF_H__*/ -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: Fix Alignment CHECK
From: Christian Luciano Moreno Fix alignment check reported by checkpatch. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/recv_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c index 4e20cbafa9fb..97c980a039bd 100644 --- a/drivers/staging/rtl8712/recv_linux.c +++ b/drivers/staging/rtl8712/recv_linux.c @@ -61,7 +61,7 @@ int r8712_os_recvbuf_resource_alloc(struct _adapter *padapter, /*free os related resource in struct recv_buf*/ int r8712_os_recvbuf_resource_free(struct _adapter *padapter, -struct recv_buf *precvbuf) + struct recv_buf *precvbuf) { if (precvbuf->pskb) dev_kfree_skb_any(precvbuf->pskb); -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: Add parenthesis to Macro argument
From: Christian Luciano Moreno Add parenthesis to Macro argument to avoid precedence issues. Signed-off-by: Christian Luciano Moreno --- drivers/staging/rtl8712/basic_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8712/basic_types.h b/drivers/staging/rtl8712/basic_types.h index 4ad7f35b1644..3e6d4ff45a75 100644 --- a/drivers/staging/rtl8712/basic_types.h +++ b/drivers/staging/rtl8712/basic_types.h @@ -21,7 +21,7 @@ #define SIZE_T __kernel_size_t #define sint signed int -#define FIELD_OFFSET(s, field) ((addr_t)&((s *)(0))->field) +#define FIELD_OFFSET(s, field) ((addr_t)&(((s) *)(0))->(field)) /* Should we extend this to be host_addr_t and target_addr_t for case: * host : x86_64 -- 2.22.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel