Re: [PATCH 1/2] staging: rtl8712: remove blank line after brace {

Larry Finger
2022-04-02T16:49:37Z

On 4/2/22 07:28, Alaa Mohamed wrote:
> Fix " CHECK: Blank lines aren't necessary after an open brace '{' "
> Reported by checkpatch
>
> Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>
> ---
> drivers/staging/rtl8712/rtl8712_xmit.c | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
> index 84a22eba7ebf..05ba0ca7d627 100644
> --- a/drivers/staging/rtl8712/rtl8712_xmit.c
> +++ b/drivers/staging/rtl8712/rtl8712_xmit.c
> @@ -147,7 +147,7 @@ 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 hw_xmit *phwxmit,
> struct tx_servq *ptxservq,
> struct __queue *pframe_queue)
> {
> @@ -167,7 +167,7 @@ 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;
> @@ -201,7 +201,7 @@ static struct xmit_frame *dequeue_xframe_ex(struct xmit_priv *pxmitpriv,
> tx_pending);
> pframe_queue = &ptxservq->sta_pending;
> pxmitframe = dequeue_one_xmitframe(pxmitpriv, phwxmit,
> - ptxservq, pframe_queue);
> + ptxservq, pframe_queue);
> if (pxmitframe) {
> phwxmit->accnt--;
> goto exit_dequeue_xframe_ex;
> @@ -292,14 +292,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->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));
> @@ -334,7 +334,7 @@ void r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
> }
>
> u16 r8712_xmitframe_aggr_next(struct xmit_buf *pxmitbuf,
> - struct xmit_frame *pxmitframe)
> + struct xmit_frame *pxmitframe)
> {
> pxmitframe->pxmitbuf = pxmitbuf;
> pxmitbuf->priv_data = pxmitframe;
> @@ -388,7 +388,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
> @@ -618,14 +618,13 @@ int r8712_xmitframe_complete(struct _adapter *padapter,
> pxmitframe = dequeue_xframe_ex(pxmitpriv, phwxmits, hwentry);
> /* need to remember the 1st frame */
> if (pxmitframe) {
> -
> #ifdef CONFIG_R8712_TX_AGGR
> /* 1. dequeue 2nd frame
> * 2. aggr if 2nd xframe is dequeued, else dump directly
> */
> 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;
> @@ -663,7 +662,7 @@ int r8712_xmitframe_complete(struct _adapter *padapter,
> if (pxmitframe->frame_tag == DATA_FRAMETAG) {
> if (pxmitframe->attrib.priority <= 15)
> res = r8712_xmitframe_coalesce(padapter,
> - pxmitframe->pkt, pxmitframe);
> + pxmitframe->pkt, pxmitframe);
> /* always return ndis_packet after
> * r8712_xmitframe_coalesce
> */
> @@ -715,10 +714,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)));

Almost all of these changes are changing code alignment, NOT removing blank
lines after a brace. Please do only one type of change for each patch, and
please make the change indicated in the commit message.

NACK

Larry