Skip to contentSkip to conversation

staging: rtl8712: fix open parentheses alignment

PATCH Superseded Ryan England 2 participants 2 messages Dec 16, 2023 – Dec 18, 2023 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Ryan England

author
#0 lore raw

PATCH 1/1 staging: rtl8712: fix open parentheses alignment

Adhere to Linux kernel coding style.

Reported by checkpatch:

CHECK: Alignment should match open parenthesis

Signed-off-by Ryan England <[email protected]>
---
 drivers/staging/rtl8712/os_intfs.c            |   2 +-
 drivers/staging/rtl8712/rtl8712_efuse.c       |   8 +-
 drivers/staging/rtl8712/rtl8712_recv.c        |   2 +-
 drivers/staging/rtl8712/rtl8712_xmit.c        |  48 ++++----
 drivers/staging/rtl8712/rtl871x_cmd.c         |  43 ++++----
 drivers/staging/rtl8712/rtl871x_cmd.h         |   7 +-
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 103 +++++++++---------
 7 files changed, 109 insertions(+), 104 deletions(-)
drivers/staging/rtl8712/os_intfs.c +1 -1
index b18e6d9c832b..1b11f8b04e13 100644
@@ -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/rtl8712_efuse.c +4 -4
index c9400e40a1d6..2f423682446b 100644
@@ -213,8 +213,8 @@ u16 r8712_efuse_get_current_size(struct _adapter *adapter)
 	u8 hworden = 0;
 	u8 efuse_data, word_cnts = 0;
 
-	while (bContinual && efuse_one_byte_read(adapter, efuse_addr,
-	       &efuse_data) && (efuse_addr < efuse_available_max_size)) {
+	while (bContinual && efuse_one_byte_read(adapter, efuse_addr, &efuse_data) &&
+	       (efuse_addr < efuse_available_max_size)) {
 		if (efuse_data != 0xFF) {
 			hworden =  efuse_data & 0x0F;
 			word_cnts = calculate_word_cnts(hworden);

@@ -253,8 +253,8 @@ u8 r8712_efuse_pg_packet_read(struct _adapter *adapter, u8 offset, u8 *data)
 				for (tmpidx = 0; tmpidx < word_cnts * 2;
 				     tmpidx++) {
 					if (efuse_one_byte_read(adapter,
-					    efuse_addr + 1 + tmpidx,
-					    &efuse_data)) {
+								efuse_addr + 1 + tmpidx,
+								&efuse_data)) {
 						tmpdata[tmpidx] = efuse_data;
 					} else {
 						ret = false;
drivers/staging/rtl8712/rtl8712_recv.c +1 -1
index 7da014ab0723..3f5b6ae3540e 100644
@@ -268,7 +268,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,
 				if (!list_empty(&pdefrag_q->queue)) {
 					/*free current defrag_q */
 					r8712_free_recvframe_queue(pdefrag_q,
-							     pfree_recv_queue);
+								   pfree_recv_queue);
 				}
 			}
 			/* Then enqueue the 0~(n-1) fragment to the defrag_q */
drivers/staging/rtl8712/rtl8712_xmit.c +25 -23

124 lines not on this page · raw message

drivers/staging/rtl8712/rtl871x_cmd.c +22 -21

122 lines not on this page · raw message

drivers/staging/rtl8712/rtl871x_cmd.h +4 -3
index 8453d8de8248..a3e7580d379a 100644
@@ -724,7 +724,7 @@ int r8712_joinbss_cmd(struct _adapter *padapter,
 		      struct wlan_network *pnetwork);
 void r8712_disassoc_cmd(struct _adapter *padapter);
 void r8712_setopmode_cmd(struct _adapter *padapter,
-		 enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
+			 enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
 int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset);
 void r8712_set_chplan_cmd(struct _adapter  *padapter, int chplan);
 int r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval);

@@ -742,13 +742,14 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
 void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,
 				      struct cmd_obj *pcmd);
 void r8712_readtssi_cmdrsp_callback(struct _adapter *padapter,
-				struct cmd_obj *pcmd);
+				    struct cmd_obj *pcmd);
 void r8712_setstaKey_cmdrsp_callback(struct _adapter  *padapter,
 				     struct cmd_obj *pcmd);
 void r8712_setassocsta_cmdrsp_callback(struct _adapter  *padapter,
 				       struct cmd_obj *pcmd);
 void r8712_disconnectCtrlEx_cmd(struct _adapter *adapter, u32 enableDrvCtrl,
-			u32 tryPktCnt, u32 tryPktInterval, u32 firstStageTO);
+				u32 tryPktCnt, u32 tryPktInterval,
+				u32 firstStageTO);
 
 struct _cmd_callback {
 	u32	cmd_code;
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +52 -51

300 lines not on this page · raw message

Signature · 1 line
2.30.2
maintainer
#1 lore raw

drivers/staging/rtl8712/rtl8712_xmit.c int r8712_xmitframe_complete(struct _adapter *padapter, · line 644

Quoted 8 lines · Ryan England
drivers/staging/rtl8712/rtl8712_xmit.c +2 -2
@@ -639,16 +640,16 @@ int r8712_xmitframe_complete(struct _adapter *padapter,
 		if (p2ndxmitframe) {
 			u16 total_length;
 
-			total_length = r8712_xmitframe_aggr_next(
-				pxmitbuf, p2ndxmitframe);
+			total_length = r8712_xmitframe_aggr_next(pxmitbuf,
+								 p2ndxmitframe);

You have 100 characters now, why not put this all on one line?

drivers/staging/rtl8712/rtl8712_xmit.c int r8712_xmitframe_complete(struct _adapter *padapter, · line 648

Quoted 6 lines
drivers/staging/rtl8712/rtl8712_xmit.c +3 -2
 			do {
-				p2ndxmitframe = dequeue_xframe_ex(
-					pxmitpriv, phwxmits, hwentry);
+				p2ndxmitframe = dequeue_xframe_ex(pxmitpriv,
+								  phwxmits,
+								  hwentry);

Same with this? And others in this patch, try to neaten stuff up when you make this type of change.

thanks,

greg k-h