Cleanup in rtl8712
cover Cleanup in rtl8712
Cleanup in rtl8712
Cristiane Naves (2):
staging: rtl8712: Fix Alignment of open parenthesis
staging: rtl8712: Remove lines before a close brace
drivers/staging/rtl8712/rtl8712_recv.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)
Signature · 1 line
2.7.4
PATCH RESEND 1/2 staging: rtl8712: Fix Alignment of open parenthesis
Fix alignment should match open parenthesis.Issue found by checkpatch.
--- drivers/staging/rtl8712/rtl8712_recv.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/rtl8712/rtl8712_recv.c +15 -15
@@ -61,13 +61,13 @@ 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 ;tasklet_init (&precvpriv->recv_tasklet, - (void (*)(unsigned long ))recv_tasklet, - (unsigned long )padapter); + (void (*)(unsigned long ))recv_tasklet, + (unsigned long )padapter);skb_queue_head_init (&precvpriv->rx_skb_queue);skb_queue_head_init (&precvpriv->free_recv_skb_queue);
@@ -140,7 +140,7 @@ void r8712_free_recvframe(union recv_frame *precvframe, }static void update_recvframe_attrib_from_recvstat (struct rx_pkt_attrib *pattrib, -struct recv_stat *prxstat) +struct recv_stat *prxstat) {u16 drvinfo_sz;
@@ -177,7 +177,7 @@ static void update_recvframe_attrib_from_recvstat(struct rx_pkt_attrib *pattrib,/*perform defrag*/ static union recv_frame *recvframe_defrag (struct _adapter *adapter, -struct __queue *defrag_q) +struct __queue *defrag_q) {struct list_head *plist, *phead;u8 wlanhdr_offset;
@@ -379,7 +379,7 @@ static void amsdu_to_msdu(struct _adapter *padapter, union recv_frame *prframe)/* convert hdr + possible LLC headers into Ethernet header */ eth_type = (sub_skb->data[6 ] <<8 ) | sub_skb->data[7 ];if (sub_skb->len >=8 && - ((!memcmp (sub_skb->data, rfc1042_header,SNAP_SIZE ) && + ((!memcmp (sub_skb->data, rfc1042_header,SNAP_SIZE ) && eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || !memcmp (sub_skb->data, bridge_tunnel_header,SNAP_SIZE ))) {/* remove RFC1042 or Bridge-Tunnel encapsulation and
@@ -387,18 +387,18 @@ static void amsdu_to_msdu(struct _adapter *padapter, union recv_frame *prframe)*/ skb_pull (sub_skb,SNAP_SIZE );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->src, -ETH_ALEN ); +ETH_ALEN );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->dst, -ETH_ALEN ); +ETH_ALEN ); }else {__be16 len;/* Leave Ethernet header part of hdr and full payload */ len =htons (sub_skb->len);memcpy (skb_push (sub_skb,2 ), &len,2 );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->src, -ETH_ALEN ); +ETH_ALEN );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->dst, -ETH_ALEN ); +ETH_ALEN ); }/* Indicate the packets to upper layer */ if (sub_skb) {
@@ -472,7 +472,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, }static int enqueue_reorder_recvframe (struct recv_reorder_ctrl *preorder_ctrl, -union recv_frame *prframe) +union recv_frame *prframe) {struct list_head *phead, *plist;union recv_frame *pnextrframe;
@@ -499,8 +499,8 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, }int r8712_recv_indicatepkts_in_order (struct _adapter *padapter, -struct recv_reorder_ctrl *preorder_ctrl, -int bforced) +struct recv_reorder_ctrl *preorder_ctrl, +int bforced) {struct list_head *phead, *plist;union recv_frame *prframe;
@@ -555,7 +555,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, }static int recv_indicatepkt_reorder (struct _adapter *padapter, -union recv_frame *prframe) +union recv_frame *prframe) {unsigned long irql;struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
@@ -624,7 +624,7 @@ void r8712_reordering_ctrl_timeout_handler(void *pcontext) }static int r8712_process_recv_indicatepkts (struct _adapter *padapter, -union recv_frame *prframe) +union recv_frame *prframe) {int retval = _SUCCESS;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
Signature · 1 line
2.7.4
Re: [RESEND PATCH 1/2] staging: rtl8712: Fix Alignment of open parenthesis
Quoted 1 line · Cristiane Naves
Fix alignment should match open parenthesis.Issue found by checkpatch.
Beyond doing style cleanups, please always try
to make the code more readable.
drivers/staging/rtl8712/rtl8712_recv.c
Quoted 1 line
drivers/staging/rtl8712/rtl8712_recv.c +0
-0
[]
drivers/staging/rtl8712/rtl8712_recv.c void r8712_init_recv_priv(struct recv_priv *precvpriv, · line 64
Quoted 6 lines
drivers/staging/rtl8712/rtl8712_recv.c +1
-1@@ -61,13 +61,13 @@ 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));
Please remove the unnecessary parentheses too
drivers/staging/rtl8712/rtl8712_recv.c void r8712_init_recv_priv(struct recv_priv *precvpriv, · line 70
Quoted 8 lines
drivers/staging/rtl8712/rtl8712_recv.c +2
-2precvbuf++; } precvpriv->free_recv_buf_queue_cnt =NR_RECVBUFF ;tasklet_init (&precvpriv->recv_tasklet, - (void (*)(unsigned long ))recv_tasklet, - (unsigned long )padapter); + (void (*)(unsigned long ))recv_tasklet, + (unsigned long )padapter);
It's probably better to change the recv_tasklet function declaration to
use the more common style of
static void recv_tasklet(unsigned long priv)
and do the cast in the recv_tasklet function.
Re: [RESEND PATCH 1/2] staging: rtl8712: Fix Alignment of open parenthesis
Quoted 8 lines · Joe Perches
Quoted 1 line · Cristiane Naves
Fix alignment should match open parenthesis.Issue found by checkpatch.
Beyond doing style cleanups, please always try
to make the code more readable.drivers/staging/rtl8712/rtl8712_recv.c
Quoted 1 line
drivers/staging/rtl8712/rtl8712_recv.c +0
-0[]
Quoted 9 lines
drivers/staging/rtl8712/rtl8712_recv.c void r8712_init_recv_priv(struct recv_priv *precvpriv, · line 64
Quoted 6 lines
drivers/staging/rtl8712/rtl8712_recv.c +1
-1@@ -61,13 +61,13 @@ 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));Please remove the unnecessary parentheses too
Removing the parentheses increases your chance of the patch being rejected on the one thing per patch rule...
regards,
dan carpenter
Re: [RESEND PATCH 1/2] staging: rtl8712: Fix Alignment of open parenthesis
Quoted 19 lines · Dan Carpenter
Quoted 8 lines · Joe Perches
Quoted 1 line · Cristiane Naves
Fix alignment should match open parenthesis.Issue found by checkpatch.
Beyond doing style cleanups, please always try
to make the code more readable.drivers/staging/rtl8712/rtl8712_recv.c
Quoted 1 line
drivers/staging/rtl8712/rtl8712_recv.c +0
-0[]
Quoted 9 lines
drivers/staging/rtl8712/rtl8712_recv.c void r8712_init_recv_priv(struct recv_priv *precvpriv, · line 64
Quoted 6 lines
drivers/staging/rtl8712/rtl8712_recv.c +1
-1@@ -61,13 +61,13 @@ 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));Please remove the unnecessary parentheses too
Quoted 2 lines
Removing the parentheses increases your chance of the patch being rejected on the one thing per patch rule...
Which for people that actually know how to
read and write code is a silly rule.
Greg Kroah-Hartman
maintainerRe: [RESEND PATCH 1/2] staging: rtl8712: Fix Alignment of open parenthesis
In reply to Cristiane NavesQuoted 1 line · Cristiane Naves
Fix alignment should match open parenthesis.Issue found by checkpatch.
Space after a '.' between sentences, right?
thanks
greg k-h
PATCH RESEND 2/2 staging: rtl8712: Remove lines before a close brace
In reply to Cristiane NavesFix Blank lines aren't necessary before a close brace '}'. Issue found by checkpatch.
--- drivers/staging/rtl8712/rtl8712_recv.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8712/rtl8712_recv.c +0 -2
@@ -289,7 +289,6 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,r8712_free_recvframe (precv_frame, pfree_recv_queue); prtnframe =NULL ; } - }if ((ismfrag ==0 ) && (fragnum !=0 )) {/* the last fragment frame
@@ -438,7 +437,6 @@ void r8712_rxcmd_event_hdl(struct _adapter *padapter, void *prxcmdbuf)r8712_event_handle (padapter, (__le32 *)poffset); poffset += (cmd_len +8 );/*8 bytes alignment*/ }while (le32_to_cpu (voffset) &BIT (31 )); - } static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl,
Signature · 1 line
2.7.4
Greg Kroah-Hartman
maintainerRe: [RESEND PATCH 2/2] staging: rtl8712: Remove lines before a close brace
Quoted 7 lines · Cristiane Naves
Fix Blank lines aren't necessary before a close brace '}'. Issue found by checkpatch.
Signed-off-by Cristiane Naves <[email protected]>--- drivers/staging/rtl8712/rtl8712_recv.c | 2 -- 1 file changed, 2 deletions(-)
What changed from the previous version? This isn't a "RESEND" it is a new version, right? Please properly document that and resend the whole series.
thanks,
greg k-h