Skip to contentSkip to conversation

staging: rtl8712: fix open parentheses alignment

PATCH In review Ryan England 3 participants 7 messages Dec 21, 2023 – Jan 3, 2024 Staging

lore
Share & tools
lore

Ryan England

author
#0 lore raw

PATCH v2 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]>

---
Made corrections give the 100 line limit. Resending v2 as no change was made other than including this comment below ---. Thank you for the correction. Here's to learning with every submission.

 drivers/staging/rtl8712/os_intfs.c            |   3 +-
 drivers/staging/rtl8712/rtl8712_efuse.c       |   9 +-
 drivers/staging/rtl8712/rtl8712_recv.c        |   3 +-
 drivers/staging/rtl8712/rtl8712_xmit.c        |  60 +++---
 drivers/staging/rtl8712/rtl871x_cmd.c         | 159 +++++---------
 drivers/staging/rtl8712/rtl871x_cmd.h         |  37 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 203 +++++++-----------
 7 files changed, 173 insertions(+), 301 deletions(-)
drivers/staging/rtl8712/os_intfs.c +1 -2
index b18e6d9c832b..7554613fe7e1 100644
@@ -221,8 +221,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->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s", padapter->pnetdev->name);
 	if (IS_ERR(padapter->cmd_thread))
 		return _FAIL;
 	return _SUCCESS;
drivers/staging/rtl8712/rtl8712_efuse.c +4 -5
index c9400e40a1d6..a39d6c06648f 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);

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

146 lines not on this page · raw message

drivers/staging/rtl8712/rtl871x_cmd.c +56 -103

304 lines not on this page · raw message

drivers/staging/rtl8712/rtl871x_cmd.h +13 -24
index 8453d8de8248..2613b3c2acfc 100644
@@ -716,39 +716,28 @@ struct DisconnectCtrlEx_param {
 #define H2C_RESERVED			0x07
 
 void r8712_setMacAddr_cmd(struct _adapter *padapter, const u8 *mac_addr);
-u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
-			struct ndis_802_11_ssid *pssid);
+u8 r8712_sitesurvey_cmd(struct _adapter *padapter, struct ndis_802_11_ssid *pssid);
 int r8712_createbss_cmd(struct _adapter *padapter);
 void r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key);
-int r8712_joinbss_cmd(struct _adapter *padapter,
-		      struct wlan_network *pnetwork);
+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);
+void r8712_setopmode_cmd(struct _adapter *padapter, 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);
 int r8712_setrfreg_cmd(struct _adapter  *padapter, u8 offset, u32 val);
 void r8712_addbareq_cmd(struct _adapter *padapter, u8 tid);
 void r8712_wdg_wk_cmd(struct _adapter *padapter);
-void r8712_survey_cmd_callback(struct _adapter  *padapter,
-			       struct cmd_obj *pcmd);
-void r8712_disassoc_cmd_callback(struct _adapter  *padapter,
-				 struct cmd_obj *pcmd);
-void r8712_joinbss_cmd_callback(struct _adapter  *padapter,
-				struct cmd_obj *pcmd);
-void r8712_createbss_cmd_callback(struct _adapter *padapter,
-				  struct cmd_obj *pcmd);
-void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,
-				      struct cmd_obj *pcmd);
-void r8712_readtssi_cmdrsp_callback(struct _adapter *padapter,
-				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);
+void r8712_survey_cmd_callback(struct _adapter  *padapter, struct cmd_obj *pcmd);
+void r8712_disassoc_cmd_callback(struct _adapter  *padapter, struct cmd_obj *pcmd);
+void r8712_joinbss_cmd_callback(struct _adapter  *padapter, struct cmd_obj *pcmd);
+void r8712_createbss_cmd_callback(struct _adapter *padapter, struct cmd_obj *pcmd);
+void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter, struct cmd_obj *pcmd);
+void r8712_readtssi_cmdrsp_callback(struct _adapter *padapter, 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);
 
 struct _cmd_callback {
 	u32	cmd_code;
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +74 -129

482 lines not on this page · raw message

Signature · 1 line
2.30.2
#1 lore raw
Quoted 7 lines · On Thu, 21 Dec 2023 20:22:48 +0000 Ryan England <[email protected]> wrote:

Adhere to Linux kernel coding style.

Reported by checkpatch:

CHECK: Alignment should match open parenthesis

Signed-off-by Ryan England <[email protected]>

You already sent a v2 in the past, so this one should be v3.

Best regards,
Nam

#2 lore raw
In reply to Ryan England
Quoted 26 lines · On Thu, 21 Dec 2023 20:22:48 +0000 Ryan England <[email protected]> wrote:

Adhere to Linux kernel coding style.

Reported by checkpatch:

CHECK: Alignment should match open parenthesis

Signed-off-by Ryan England <[email protected]>

---
Made corrections give the 100 line limit. Resending v2 as no change was made other than including this comment below ---. Thank you for the correction. Here's to learning with every submission.

 drivers/staging/rtl8712/os_intfs.c            |   3 +-
 drivers/staging/rtl8712/rtl8712_efuse.c       |   9 +-
 drivers/staging/rtl8712/rtl8712_recv.c        |   3 +-
 drivers/staging/rtl8712/rtl8712_xmit.c        |  60 +++---
 drivers/staging/rtl8712/rtl871x_cmd.c         | 159 +++++---------
 drivers/staging/rtl8712/rtl871x_cmd.h         |  37 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 203 +++++++-----------
 7 files changed, 173 insertions(+), 301 deletions(-)
drivers/staging/rtl8712/os_intfs.c +0 -0
index b18e6d9c832b..7554613fe7e1 100644

drivers/staging/rtl8712/os_intfs.c struct net_device *r8712_init_netdev(void) · line 224

Quoted 6 lines
drivers/staging/rtl8712/os_intfs.c +1 -2
@@ -221,8 +221,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->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s", padapter->pnetdev->name);

Your description claims to fix "CHECK: Alignment should match open parenthesis", but this one is already aligned, isn't it?

Note that, because you CAN you 100 characters, does not mean you MUST use 100 characters.

Best regards,
Nam

#5 lore raw
In reply to Ryan England
Quoted 26 lines · On Thu, 21 Dec 2023 20:22:48 +0000 Ryan England <[email protected]> wrote:

Adhere to Linux kernel coding style.

Reported by checkpatch:

CHECK: Alignment should match open parenthesis

Signed-off-by Ryan England <[email protected]>

---
Made corrections give the 100 line limit. Resending v2 as no change was made other than including this comment below ---. Thank you for the correction. Here's to learning with every submission.

 drivers/staging/rtl8712/os_intfs.c            |   3 +-
 drivers/staging/rtl8712/rtl8712_efuse.c       |   9 +-
 drivers/staging/rtl8712/rtl8712_recv.c        |   3 +-
 drivers/staging/rtl8712/rtl8712_xmit.c        |  60 +++---
 drivers/staging/rtl8712/rtl871x_cmd.c         | 159 +++++---------
 drivers/staging/rtl8712/rtl871x_cmd.h         |  37 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 203 +++++++-----------
 7 files changed, 173 insertions(+), 301 deletions(-)
drivers/staging/rtl8712/os_intfs.c +0 -0
index b18e6d9c832b..7554613fe7e1 100644

drivers/staging/rtl8712/os_intfs.c struct net_device *r8712_init_netdev(void) · line 224

Quoted 6 lines
drivers/staging/rtl8712/os_intfs.c +1 -2
@@ -221,8 +221,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->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s", padapter->pnetdev->name);

Your description claims to fix "CHECK: Alignment should match open parenthesis", but this one is already aligned, isn't it?

Note that, because you CAN you 100 characters, does not mean you MUST use 100 characters.

Best regards,
Nam

#6 lore raw
Quoted 2 lines · On Fri, 22 Dec 2023 09:52:59 +0100 Nam Cao <[email protected]> wrote:

Note that, because you CAN you 100 characters, does not mean you MUST use 100 characters.

I don't know why I wrote it this way. What I meant to say is that it is probably not worth it to change the code only to make sure they use all 100 characters.

Best regards,
Nam

#3 lore raw
In reply to Nam Cao
Quoted 29 lines · Nam Cao
Quoted 27 lines · On Thu, 21 Dec 2023 20:22:48 +0000 Ryan England <[email protected]> wrote:

Adhere to Linux kernel coding style.

Reported by checkpatch:

CHECK: Alignment should match open parenthesis

Signed-off-by Ryan England <[email protected]>

---
Made corrections give the 100 line limit. Resending v2 as no change was made other than including this comment below ---. Thank you for the correction. Here's to learning with every submission.

 drivers/staging/rtl8712/os_intfs.c            |   3 +-
 drivers/staging/rtl8712/rtl8712_efuse.c       |   9 +-
 drivers/staging/rtl8712/rtl8712_recv.c        |   3 +-
 drivers/staging/rtl8712/rtl8712_xmit.c        |  60 +++---
 drivers/staging/rtl8712/rtl871x_cmd.c         | 159 +++++---------
 drivers/staging/rtl8712/rtl871x_cmd.h         |  37 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 203 +++++++-----------
 7 files changed, 173 insertions(+), 301 deletions(-)
drivers/staging/rtl8712/os_intfs.c +0 -0
index b18e6d9c832b..7554613fe7e1 100644
@@ -221,8 +221,7 @@ struct net_device *r8712_init_netdev(void)
Quoted 8 lines

drivers/staging/rtl8712/os_intfs.c struct net_device *r8712_init_netdev(void) · line 224

Quoted 5 lines
drivers/staging/rtl8712/os_intfs.c +1 -2
 static u32 start_drv_threads(struct _adapter *padapter)
 {
-	padapter->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s",
-					  padapter->pnetdev->name);
+	padapter->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s", padapter->pnetdev->name);

Your description claims to fix "CHECK: Alignment should match open parenthesis", but this one is already aligned, isn't it?

No. It was not aligned. There was a space character missing.

regards,
dan carpenter

#4 lore raw
Quoted 11 lines · On Wed, 3 Jan 2024 16:19:45 +0300 Dan Carpenter <[email protected]>…
Quoted 9 lines · Nam Cao

drivers/staging/rtl8712/os_intfs.c struct net_device *r8712_init_netdev(void) · line 224

Quoted 5 lines · On Thu, 21 Dec 2023 20:22:48 +0000 Ryan England <[email protected]> wrote:

static u32 start_drv_threads(struct _adapter *padapter) {

drivers/staging/rtl8712/os_intfs.c +1 -2
-	padapter->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s",
-					  padapter->pnetdev->name);
+	padapter->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s", padapter->pnetdev->name);

Your description claims to fix "CHECK: Alignment should match open parenthesis", but this one is already aligned, isn't it?

Quoted 1 line

No. It was not aligned. There was a space character missing.

Ah right, sorry for the noises.

Best regards,
Nam