staging: rtl8712: Spacing and alignment cleanup
cover staging: rtl8712: Spacing and alignment cleanup
This patchset fixes minor issues with spacing and alignment. Three types of checkpatch.pl messages are addressed:
- UNNECESSARY_PARENTHESES
- LINE_SPACING
- PARENTHESIS_ALIGNMENT
Frank A. Cancio Bello (3):
staging: rtl8712: Fix parentheses alignment
staging: rtl8712: Fix spacing issues
staging: rtl8712: Remove unnecessary parentheses
drivers/staging/rtl8712/os_intfs.c | 2 +- drivers/staging/rtl8712/osdep_service.h | 2 +- drivers/staging/rtl8712/rtl8712_recv.c | 16 ++++++++-------- drivers/staging/rtl8712/rtl8712_xmit.c | 21 +++++++++++---------- drivers/staging/rtl8712/rtl871x_cmd.h | 9 +++++++++ drivers/staging/rtl8712/rtl871x_event.h | 1 + 6 files changed, 31 insertions(+), 20 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 staging: rtl8712: Fix parentheses alignment
checkpatch message:
CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
--- drivers/staging/rtl8712/os_intfs.c | 2 +- drivers/staging/rtl8712/osdep_service.h | 2 +- drivers/staging/rtl8712/rtl8712_xmit.c | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-)
drivers/staging/rtl8712/os_intfs.c +1 -1
@@ -222,7 +222,7 @@ struct net_device *r8712_init_netdev(void)static u32 start_drv_threads (struct _adapter *padapter) { padapter->cmd_thread =kthread_run (r8712_cmd_thread, padapter,"%s" , - padapter->pnetdev->name); + padapter->pnetdev->name);if (IS_ERR (padapter->cmd_thread))return _FAIL;return _SUCCESS;
drivers/staging/rtl8712/osdep_service.h +1 -1
@@ -46,7 +46,7 @@ struct __queue { }while (0 ) static inline u32 end_of_queue_search(struct list_head *head, -struct list_head *plist) +struct list_head *plist) {return (head == plist); }
drivers/staging/rtl8712/rtl8712_xmit.c +11 -10
@@ -147,9 +147,9 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitframe) }static struct xmit_frame *dequeue_one_xmitframe (struct xmit_priv *pxmitpriv, -struct hw_xmit *phwxmit, -struct tx_servq *ptxservq, -struct __queue *pframe_queue) +struct hw_xmit *phwxmit, +struct tx_servq *ptxservq, +struct __queue *pframe_queue) {struct list_head *xmitframe_plist, *xmitframe_phead;struct xmit_frame *pxmitframe =NULL ;
@@ -167,7 +167,8 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, }static struct xmit_frame *dequeue_xframe_ex (struct xmit_priv *pxmitpriv, -struct hw_xmit *phwxmit_i,sint entry) +struct hw_xmit *phwxmit_i, +sint entry) {unsigned long irqL0;struct list_head *sta_plist, *sta_phead;
@@ -292,14 +293,14 @@ void r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf,r8712_xmit_complete (padapter, pxmitframe);if (pxmitframe->attrib.ether_type !=0x0806 ) {if ((pxmitframe->attrib.ether_type !=0x888e ) && - (pxmitframe->attrib.dhcp_pkt !=1 )) { + (pxmitframe->attrib.dhcp_pkt !=1 )) {r8712_issue_addbareq_cmd (padapter, pxmitframe->attrib.priority); } } pxmitframe->last[0 ] =1 ;update_txdesc (pxmitframe, (uint *)(pxmitframe->buf_addr), - pxmitframe->attrib.last_txcmdsz); + pxmitframe->attrib.last_txcmdsz);/*padding zero */ last_txcmdsz = pxmitframe->attrib.last_txcmdsz; padding_sz = (8 - (last_txcmdsz %8 ));
@@ -389,7 +390,7 @@ void r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf, /*default = 32 bytes for TX Desc*/ }r8712_write_port (pxmitframe->padapter,RTL8712_DMA_H2CCMD , - total_length +TXDESC_SIZE , (u8 *)pxmitframe); + total_length +TXDESC_SIZE , (u8 *)pxmitframe); }#endif
@@ -626,7 +627,7 @@ int r8712_xmitframe_complete(struct _adapter *padapter,*/ if (AGGR_NR_HIGH_BOUND >1 ) p2ndxmitframe =dequeue_xframe_ex (pxmitpriv, phwxmits, - hwentry); + hwentry);if (pxmitframe->frame_tag !=DATA_FRAMETAG ) {r8712_free_xmitbuf (pxmitpriv, pxmitbuf);return false;
@@ -716,10 +717,10 @@ static void dump_xframe(struct _adapter *padapter, ff_hwaddr =get_ff_hwaddr (pxmitframe);#ifdef CONFIG_R8712_TX_AGGR r8712_write_port (padapter,RTL8712_DMA_H2CCMD , w_sz, - (unsigned char *)pxmitframe); + (unsigned char *)pxmitframe);#else r8712_write_port (padapter, ff_hwaddr, w_sz, - (unsigned char *)pxmitframe); + (unsigned char *)pxmitframe);#endif mem_addr += w_sz; mem_addr = (u8 *)RND4 (((addr_t)(mem_addr)));
Signature · 1 line
2.17.1
PATCH 2/3 staging: rtl8712: Fix spacing issues
In reply to Frank A. Cancio Bellocheckpatch message:
"CHECK:LINE_SPACING: Please use a blank line after function/struct/union/ enum declarations"
--- drivers/staging/rtl8712/rtl871x_cmd.h | 9 +++++++++ drivers/staging/rtl8712/rtl871x_event.h | 1 + 2 files changed, 10 insertions(+)
drivers/staging/rtl8712/rtl871x_cmd.h +9 -0
@@ -333,6 +333,7 @@ struct getdatarate_parm {u32 rsvd; }; +struct getdatarate_rsp {u8 datarates[NumRates]; };
@@ -377,6 +378,7 @@ struct getphy_rsp {struct readBB_parm {u8 offset; }; +struct readBB_rsp {u8 value; };
@@ -384,6 +386,7 @@ struct readBB_rsp {struct readTSSI_parm {u8 offset; }; +struct readTSSI_rsp {u8 value; };
@@ -400,6 +403,7 @@ struct writePTM_parm {struct readRF_parm {u8 offset; }; +struct readRF_rsp {u32 value; };
@@ -513,6 +517,7 @@ struct setssup_parm {struct getssup_parm {u32 rsvd; }; +struct getssup_rsp {u8 ss_ForceUp[MAX_RATES_LENGTH ]; };
@@ -524,6 +529,7 @@ struct setssdlevel_parm {struct getssdlevel_parm {u32 rsvd; }; +struct getssdlevel_rsp {u8 ss_DLevel[MAX_RATES_LENGTH ]; };
@@ -535,6 +541,7 @@ struct setssulevel_parm {struct getssulevel_parm {u32 rsvd; }; +struct getssulevel_rsp {u8 ss_ULevel[MAX_RATES_LENGTH ]; };
@@ -585,6 +592,7 @@ struct setratable_parm {struct getratable_parm {uint rsvd; }; +struct getratable_rsp {u8 ss_ForceUp[NumRates];u8 ss_ULevel[NumRates];
@@ -621,6 +629,7 @@ struct getbcnokcnt_rsp {struct getbcnerrcnt_parm {unsigned int rsvd; }; +struct getbcnerrcnt_rsp {unsigned long bcnerrcnt; };
drivers/staging/rtl8712/rtl871x_event.h +1 -0
@@ -102,6 +102,7 @@ struct ADDBA_Req_Report_parm {unsigned short StartSeqNum; unsigned char tid; }; +#include "rtl8712_event.h" #endif /* _WLANEVENT_H_ */
Signature · 1 line
2.17.1
PATCH 3/3 staging: rtl8712: Remove unnecessary parentheses
In reply to Frank A. Cancio Bellocheckpatch message:
CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around...
--- drivers/staging/rtl8712/rtl8712_recv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8712/rtl8712_recv.c +8 -8
@@ -61,7 +61,7 @@ void r8712_init_recv_priv(struct recv_priv *precvpriv, precvbuf->ref_cnt =0 ; precvbuf->adapter = padapter;list_add_tail (&precvbuf->list, - &(precvpriv->free_recv_buf_queue.queue)); + &precvpriv->free_recv_buf_queue.queue); precvbuf++; } precvpriv->free_recv_buf_queue_cnt =NR_RECVBUFF ;
@@ -130,8 +130,8 @@ void r8712_free_recvframe(union recv_frame *precvframe, precvframe->u.hdr.pkt =NULL ; }spin_lock_irqsave (&pfree_recv_queue->lock, irqL); -list_del_init (&(precvframe->u.hdr.list)); -list_add_tail (&(precvframe->u.hdr.list), &pfree_recv_queue->queue); +list_del_init (&precvframe->u.hdr.list); +list_add_tail (&precvframe->u.hdr.list, &pfree_recv_queue->queue);if (padapter) {if (pfree_recv_queue == &precvpriv->free_recv_queue) precvpriv->free_recvframe_cnt++;
@@ -327,7 +327,7 @@ static void amsdu_to_msdu(struct _adapter *padapter, union recv_frame *prframe)struct rx_pkt_attrib *pattrib;_pkt *sub_skb, *subframes[MAX_SUBFRAME_COUNT ];struct recv_priv *precvpriv = &padapter->recvpriv; -struct __queue *pfree_recv_queue = &(precvpriv->free_recv_queue); +struct __queue *pfree_recv_queue = &precvpriv->free_recv_queue; nr_subframes =0 ; pattrib = &prframe->u.hdr.attrib;
@@ -491,8 +491,8 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,else break ; } -list_del_init (&(prframe->u.hdr.list)); -list_add_tail (&(prframe->u.hdr.list), plist); +list_del_init (&prframe->u.hdr.list); +list_add_tail (&prframe->u.hdr.list, plist);return true; }
@@ -526,7 +526,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, pattrib = &prframe->u.hdr.attrib;if (!SN_LESS (preorder_ctrl->indicate_seq, pattrib->seq_num)) { plist = plist->next; -list_del_init (&(prframe->u.hdr.list)); +list_del_init (&prframe->u.hdr.list);if (SN_EQUAL (preorder_ctrl->indicate_seq, pattrib->seq_num)) preorder_ctrl->indicate_seq =
@@ -992,7 +992,7 @@ static void recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb)union recv_frame *precvframe =NULL ;struct recv_priv *precvpriv = &padapter->recvpriv; - pfree_recv_queue = &(precvpriv->free_recv_queue); + pfree_recv_queue = &precvpriv->free_recv_queue; pbuf = pskb->data; prxstat = (struct recv_stat *)pbuf; pkt_cnt = (le32_to_cpu (prxstat->rxdw2) >>16 ) &0xff ;
Signature · 1 line
2.17.1