Staging: rtl8188eu: Lines over 80 characters fixed.
PATCH 1/1 Staging: rtl8188eu: Lines over 80 characters fixed.
This is a patch to the hal/rtl8188eu_recv.c file that fixes up a "line over 80 characters" warning found by the checkpatch.pl tool.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 28 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +18 -10
@@ -41,15 +41,19 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)/* init recv_buf */ _rtw_init_queue (&precvpriv->free_recv_buf_queue); - precvpriv->pallocated_recv_buf =kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL ); + precvpriv->pallocated_recv_buf = +kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL );if (precvpriv->pallocated_recv_buf ==NULL ) { res = _FAIL; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n" )); +RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, + ("alloc recv_buf fail!\n" )); goto exit; } -memset (precvpriv->pallocated_recv_buf,0 ,NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); +memset (precvpriv->pallocated_recv_buf,0 , +NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); - precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(precvpriv->pallocated_recv_buf),4 ); + precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t ) + (precvpriv->pallocated_recv_buf),4 ); precvbuf = (struct recv_buf *)precvpriv->precv_buf;
@@ -66,20 +70,23 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) {int i;size_t tmpaddr =0 ; -size_t alignment =0 ; +size_t alignm =0 ;struct sk_buff *pskb =NULL ;skb_queue_head_init (&precvpriv->free_recv_skb_queue);for (i =0 ; i <NR_PREALLOC_RECV_SKB ; i++) { - pskb =__netdev_alloc_skb (padapter->pnetdev,MAX_RECVBUF_SZ +RECVBUFF_ALIGN_SZ ,GFP_KERNEL ); + pskb =__netdev_alloc_skb (padapter->pnetdev, +MAX_RECVBUF_SZ +RECVBUFF_ALIGN_SZ , +GFP_KERNEL );if (pskb) { pskb->dev = padapter->pnetdev; tmpaddr = (size_t )pskb->data; - alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 ); -skb_reserve (pskb, (RECVBUFF_ALIGN_SZ - alignment)); + alignm = tmpaddr & (RECVBUFF_ALIGN_SZ -1 ); +skb_reserve (pskb, (RECVBUFF_ALIGN_SZ - alignm)); -skb_queue_tail (&precvpriv->free_recv_skb_queue, pskb); +skb_queue_tail (&precvpriv->free_recv_skb_queue, + pskb); } pskb =NULL ; }
@@ -109,7 +116,8 @@ void rtl8188eu_free_recv_priv(struct adapter *padapter)if (skb_queue_len (&precvpriv->free_recv_skb_queue)) -DBG_88E (KERN_WARNING "free_recv_skb_queue not empty, %d\n" ,skb_queue_len (&precvpriv->free_recv_skb_queue)); +DBG_88E (KERN_WARNING "free_recv_skb_queue not empty, %d\n" , +skb_queue_len (&precvpriv->free_recv_skb_queue));skb_queue_purge (&precvpriv->free_recv_skb_queue); }
Signature · 1 line
2.0.4
Quoted 2 lines · Adrian Remonda
This is a patch to the
hal/rtl8188eu_recv.cfile that fixes up a "line over 80 characters" warning found by the checkpatch.pl tool.
[]
Quoted 15 lines
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +3
-2@@ -41,15 +41,19 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)/* init recv_buf */ _rtw_init_queue (&precvpriv->free_recv_buf_queue); - precvpriv->pallocated_recv_buf =kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL ); + precvpriv->pallocated_recv_buf = +kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL );if (precvpriv->pallocated_recv_buf ==NULL ) { res = _FAIL; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n" )); + RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c int rtl8188eu_init_recv_priv(struct adapter *padapter) · line 56
Quoted 10 lines
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +5
-2+ ("alloc recv_buf fail!\n")); goto exit; } -memset (precvpriv->pallocated_recv_buf,0 ,NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); +memset (precvpriv->pallocated_recv_buf,0 , +NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); - precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(precvpriv->pallocated_recv_buf),4 ); + precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t ) + (precvpriv->pallocated_recv_buf),4 );
Several bits of this are not nice.
the +4 seems senseless.
zalloc followed by a memset(,0,) is senseless. N_BYTE_ALIGNMENT seems senseless as alloc is suitable for any alignmet.
btw: The merge window is open, please be patient with any staging patch during the merge window.
Quoted 32 lines · Joe Perches
Quoted 2 lines · Adrian Remonda
This is a patch to the
hal/rtl8188eu_recv.cfile that fixes up a "line over 80 characters" warning found by the checkpatch.pl tool.[]
Quoted 15 lines
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +3
-2@@ -41,15 +41,19 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)/* init recv_buf */ _rtw_init_queue (&precvpriv->free_recv_buf_queue); - precvpriv->pallocated_recv_buf =kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL ); + precvpriv->pallocated_recv_buf = +kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL );if (precvpriv->pallocated_recv_buf ==NULL ) { res = _FAIL; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n" )); + RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c int rtl8188eu_init_recv_priv(struct adapter *padapter) · line 56
Quoted 10 lines
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +5
-2+ ("alloc recv_buf fail!\n")); goto exit; } -memset (precvpriv->pallocated_recv_buf,0 ,NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); +memset (precvpriv->pallocated_recv_buf,0 , +NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); - precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(precvpriv->pallocated_recv_buf),4 ); + precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t ) + (precvpriv->pallocated_recv_buf),4 );Several bits of this are not nice.
Quoted 7 lines
the +4 seems senseless.
zalloc followed by amemset(,0,)is senseless.N_BYTE_ALIGNMENTseems senseless as alloc is suitable for any alignmet.btw: The merge window is open, please be patient with any staging patch during the merge window.
I have resent the changes now. Is this ok? Or should I wait until the merge window is close?
Also N_BYTE_ALIGNMENT is being used by several files in the 8188, should I remove this macro?
Quoted 2 lines · AdrianRemonda
I have resent the changes now. Is this ok? Or should I wait until the merge window is close?
Just send your patches. They will sit in Greg's inbox for a couple weeks, but that's ok.
Quoted 2 lines
Also
N_BYTE_ALIGNMENTis being used by several files in the 8188, should I remove this macro?
kmalloc() returns properly aligned pointers.
Look at how N_BYTE_ALIGNMENT() is used and judge each time if it is needed.
regards,
dan carpenter