Skip to contentSkip to conversation

staging: rtl8712: Fixed CamelCase in struct _adapter

PATCH In review Deepak Mishra 2 participants 16 messages Jun 2, 2019 – Jun 4, 2019 Staging

lore
Share & tools
lore
#0 lore raw

v2 cover staging: rtl8712: Fixed CamelCase in struct _adapter

This patchset fixes CamelCase checks in struct _adapter in drv_types.h and in files where struct _adapter is used by renaming the variables without camel case.

These check were reported by checkpatch.pl

This patch also changes type of enable_rx_ff0_filter as bool

Deepak Mishra (9):
staging: rtl8712: Fixed CamelCase rename ImrContent to imr_content
staging: rtl8712: Fixed CamelCase EepromAddressSize rename to
eeprom_address_size
staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread
staging: rtl8712: Fixed CamelCase renames evtThread to evt_thread
staging: rtl8712: Fixed CamelCase renames IsrContent to isr_content
staging: rtl8712: Fixed CamelCase renames xmitThread and recvThread
staging: rtl8712: Fixed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0 in
staging: rtl8712: fixed enable_rx_ff0_filter as bool and CamelCase
staging: rtl8712: Fixed CamelCase lockRxFF0Filter

 drivers/staging/rtl8712/drv_types.h        | 20 ++++++++++----------
 drivers/staging/rtl8712/os_intfs.c         |  6 +++---
 drivers/staging/rtl8712/rtl871x_cmd.c      |  2 +-
 drivers/staging/rtl8712/rtl871x_eeprom.c   |  6 +++---
 drivers/staging/rtl8712/rtl871x_mp_ioctl.c |  2 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.h  |  2 +-
 drivers/staging/rtl8712/rtl871x_xmit.c     |  2 +-
 drivers/staging/rtl8712/usb_intf.c         |  4 ++--
 drivers/staging/rtl8712/xmit_linux.c       | 10 +++++-----
 9 files changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
2.19.1
#1 lore raw

PATCH v2 1/9 staging: rtl8712: Fixed CamelCase rename ImrContent to imr_content

This patch renames CamelCase ImrContent to imr_content in struct _adapter and related files drv_types.h, rtl871x_mp_ioctl.c, rtl871x_pwrctrl.h

CHECK: Avoid CamelCase: <ImrContent>

---
 drivers/staging/rtl8712/drv_types.h        | 2 +-
 drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 2 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index 9ae86631fa8b..89ebb5a49d25 100644
@@ -149,7 +149,7 @@ struct _adapter {
 	bool	surprise_removed;
 	bool	suspended;
 	u32	IsrContent;
-	u32	ImrContent;
+	u32	imr_content;
 	u8	EepromAddressSize;
 	u8	hw_init_completed;
 	struct task_struct *cmdThread;
drivers/staging/rtl8712/rtl871x_mp_ioctl.c +1 -1
index 588346da1412..4cf9d3afd2c5 100644
@@ -665,7 +665,7 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
 		if ((status == RNDIS_STATUS_SUCCESS) &&
 		    (RegRWStruct->offset == HIMR) &&
 		    (RegRWStruct->width == 4))
-			Adapter->ImrContent = RegRWStruct->value;
+			Adapter->imr_content = RegRWStruct->value;
 	}
 	return status;
 }
drivers/staging/rtl8712/rtl871x_pwrctrl.h +1 -1
index 11b5034f203d..cca81a3f4031 100644
@@ -88,7 +88,7 @@ struct	pwrctrl_priv {
 	uint pwr_mode;
 	uint smart_ps;
 	uint alives;
-	uint ImrContent;	/* used to store original imr. */
+	uint imr_content;	/* used to store original imr. */
 	uint bSleep; /* sleep -> active is different from active -> sleep. */
 
 	struct work_struct SetPSModeWorkItem;
Signature · 1 line
2.19.1
#3 lore raw

PATCH v2 2/9 staging: rtl8712: Fixed CamelCase EepromAddressSize rename to eeprom_address_size

In reply to Deepak Mishra

This patch renames CamelCase EepromAddressSizefrom to eeprom_address_size in struct _adapter and in related files drv_types.h, rtl871x_eeprom.c, usb_intf.c

CHECK: Avoid CamelCase: <EepromAddressSize>

---
 drivers/staging/rtl8712/drv_types.h      | 2 +-
 drivers/staging/rtl8712/rtl871x_eeprom.c | 6 +++---
 drivers/staging/rtl8712/usb_intf.c       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index 89ebb5a49d25..7d1178278ecc 100644
@@ -150,7 +150,7 @@ struct _adapter {
 	bool	suspended;
 	u32	IsrContent;
 	u32	imr_content;
-	u8	EepromAddressSize;
+	u8	eeprom_address_size;
 	u8	hw_init_completed;
 	struct task_struct *cmdThread;
 	pid_t evtThread;
drivers/staging/rtl8712/rtl871x_eeprom.c +3 -3
index 0027d8eb22fa..221bf92e1b1c 100644
@@ -150,7 +150,7 @@ void r8712_eeprom_write16(struct _adapter *padapter, u16 reg, u16 data)
 	x |= _EEM1 | _EECS;
 	r8712_write8(padapter, EE_9346CR, x);
 	shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5);
-	if (padapter->EepromAddressSize == 8)	/*CF+ and SDIO*/
+	if (padapter->eeprom_address_size == 8)	/*CF+ and SDIO*/
 		shift_out_bits(padapter, 0, 6);
 	else	/* USB */
 		shift_out_bits(padapter, 0, 4);
@@ -165,7 +165,7 @@ void r8712_eeprom_write16(struct _adapter *padapter, u16 reg, u16 data)
 	 */
 	shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3);
 	/* select which word in the EEPROM that we are writing to. */
-	shift_out_bits(padapter, reg, padapter->EepromAddressSize);
+	shift_out_bits(padapter, reg, padapter->eeprom_address_size);
 	/* write the data to the selected EEPROM word. */
 	shift_out_bits(padapter, data, 16);
 	if (wait_eeprom_cmd_done(padapter)) {
@@ -207,7 +207,7 @@ u16 r8712_eeprom_read16(struct _adapter *padapter, u16 reg) /*ReadEEprom*/
 	 * The opcode is 3bits in length, reg is 6 bits long
 	 */
 	shift_out_bits(padapter, EEPROM_READ_OPCODE, 3);
-	shift_out_bits(padapter, reg, padapter->EepromAddressSize);
+	shift_out_bits(padapter, reg, padapter->eeprom_address_size);
 	/* Now read the data (16 bits) in from the selected EEPROM word */
 	data = shift_in_bits(padapter);
 	eeprom_clean(padapter);
drivers/staging/rtl8712/usb_intf.c +1 -1
index 7478bbd3de78..200a271c28e1 100644
@@ -246,7 +246,7 @@ static uint r8712_usb_dvobj_init(struct _adapter *padapter)
 	struct usb_device *pusbd = pdvobjpriv->pusbdev;
 
 	pdvobjpriv->padapter = padapter;
-	padapter->EepromAddressSize = 6;
+	padapter->eeprom_address_size = 6;
 	phost_iface = &pintf->altsetting[0];
 	piface_desc = &phost_iface->desc;
 	pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
Signature · 1 line
2.19.1
#4 lore raw

PATCH v2 3/9 staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread

In reply to Deepak Mishra

This patch renames CamelCase cmdThread to cmd_thread in struct _adapter and related files drv_types.h,os_intfs.c
CHECK: Avoid CamelCase: <cmdThread>

---
 drivers/staging/rtl8712/drv_types.h | 2 +-
 drivers/staging/rtl8712/os_intfs.c  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index 7d1178278ecc..c6faafb13bdf 100644
@@ -152,7 +152,7 @@ struct _adapter {
 	u32	imr_content;
 	u8	eeprom_address_size;
 	u8	hw_init_completed;
-	struct task_struct *cmdThread;
+	struct task_struct *cmd_thread;
 	pid_t evtThread;
 	struct task_struct *xmitThread;
 	pid_t recvThread;
drivers/staging/rtl8712/os_intfs.c +3 -3
index c962696c9822..1653b36c4bfd 100644
@@ -221,9 +221,9 @@ struct net_device *r8712_init_netdev(void)
 
 static u32 start_drv_threads(struct _adapter *padapter)
 {
-	padapter->cmdThread = kthread_run(r8712_cmd_thread, padapter, "%s",
+	padapter->cmd_thread = kthread_run(r8712_cmd_thread, padapter, "%s",
 					  padapter->pnetdev->name);
-	if (IS_ERR(padapter->cmdThread))
+	if (IS_ERR(padapter->cmd_thread))
 		return _FAIL;
 	return _SUCCESS;
 }
@@ -235,7 +235,7 @@ void r8712_stop_drv_threads(struct _adapter *padapter)
 
 	/*Below is to terminate r8712_cmd_thread & event_thread...*/
 	complete(&padapter->cmdpriv.cmd_queue_comp);
-	if (padapter->cmdThread)
+	if (padapter->cmd_thread)
 		wait_for_completion_interruptible(completion);
 	padapter->cmdpriv.cmd_seq = 1;
 }
Signature · 1 line
2.19.1
#5 lore raw

PATCH v2 4/9 staging: rtl8712: Fixed CamelCase renames evtThread to evt_thread

In reply to Deepak Mishra

This patch fixes CamelCase renames evtThread to evt_thread in struct _adapter as reported by checkpatch.pl
CHECK: Avoid CamelCase: <evtThread>

---
 drivers/staging/rtl8712/drv_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index c6faafb13bdf..5360f049088a 100644
@@ -153,7 +153,7 @@ struct _adapter {
 	u8	eeprom_address_size;
 	u8	hw_init_completed;
 	struct task_struct *cmd_thread;
-	pid_t evtThread;
+	pid_t evt_thread;
 	struct task_struct *xmitThread;
 	pid_t recvThread;
 	uint (*dvobj_init)(struct _adapter *adapter);
Signature · 1 line
2.19.1
#7 lore raw

PATCH v2 5/9 staging: rtl8712: Fixed CamelCase renames IsrContent to isr_content

In reply to Deepak Mishra

This patch fixes CamelCase IsrContent to isr_content as suggested by checkpatch.pl

---
 drivers/staging/rtl8712/drv_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index 5360f049088a..a5060a020b2b 100644
@@ -148,7 +148,7 @@ struct _adapter {
 	bool	driver_stopped;
 	bool	surprise_removed;
 	bool	suspended;
-	u32	IsrContent;
+	u32	isr_content;
 	u32	imr_content;
 	u8	eeprom_address_size;
 	u8	hw_init_completed;
Signature · 1 line
2.19.1
#9 lore raw

PATCH v2 6/9 staging: rtl8712: Fixed CamelCase renames xmitThread and recvThread

In reply to Deepak Mishra

This patch fixes CamelCase as reported by checkpatch.pl xmitThread renamed to xmit_thread
recvThread renamed to recv_thread

---
 drivers/staging/rtl8712/drv_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8712/drv_types.h +2 -2
index a5060a020b2b..1f8aa0358b77 100644
@@ -154,8 +154,8 @@ struct _adapter {
 	u8	hw_init_completed;
 	struct task_struct *cmd_thread;
 	pid_t evt_thread;
-	struct task_struct *xmitThread;
-	pid_t recvThread;
+	struct task_struct *xmit_thread;
+	pid_t recv_thread;
 	uint (*dvobj_init)(struct _adapter *adapter);
 	void (*dvobj_deinit)(struct _adapter *adapter);
 	struct net_device *pnetdev;
Signature · 1 line
2.19.1
#11 lore raw

PATCH v2 7/9 staging: rtl8712: Fixed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0 in

In reply to Deepak Mishra

This patch renames CamelCase variable wkFilterRxFF0 to wk_filter_rx_ff0 in drv_types.h and related files rtl871x_xmit.c and xmit_linux.c as reported by checkpatch.pl

---
 drivers/staging/rtl8712/drv_types.h    | 2 +-
 drivers/staging/rtl8712/rtl871x_xmit.c | 2 +-
 drivers/staging/rtl8712/xmit_linux.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index 1f8aa0358b77..ddab6514a549 100644
@@ -163,7 +163,7 @@ struct _adapter {
 	struct net_device_stats stats;
 	struct iw_statistics iwstats;
 	int pid; /*process id from UI*/
-	struct work_struct wkFilterRxFF0;
+	struct work_struct wk_filter_rx_ff0;
 	u8 blnEnableRxFF0Filter;
 	spinlock_t lockRxFF0Filter;
 	const struct firmware *fw;
drivers/staging/rtl8712/rtl871x_xmit.c +1 -1
index bfd5538a4652..5d63d2721eb6 100644
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
 		pxmitbuf++;
 	}
 	pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
-	INIT_WORK(&padapter->wkFilterRxFF0, r8712_SetFilter);
+	INIT_WORK(&padapter->wk_filter_rx_ff0, r8712_SetFilter);
 	alloc_hwxmits(padapter);
 	init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
 	tasklet_init(&pxmitpriv->xmit_tasklet,
drivers/staging/rtl8712/xmit_linux.c +1 -1
index 8bcb0775411f..e65a51c7f372 100644
@@ -94,7 +94,7 @@ void r8712_set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
 void r8712_SetFilter(struct work_struct *work)
 {
 	struct _adapter *padapter = container_of(work, struct _adapter,
-						wkFilterRxFF0);
+						wk_filter_rx_ff0);
 	u8  oldvalue = 0x00, newvalue = 0x00;
 	unsigned long irqL;
 
Signature · 1 line
2.19.1
#12 lore raw

PATCH v2 8/9 staging: rtl8712: fixed enable_rx_ff0_filter as bool and CamelCase

In reply to Deepak Mishra

This patch fixes CamelCase blnEnableRxFF0Filter by renaming it to enable_rx_ff0_filter in drv_types.h and related files rtl871x_cmd.c xmit_linux.c
It was reported by checkpatch.pl

This fix also makes enable_rx_ff0_filter a bool and uses true false than previously used u8 as suggested by [email protected]

---
 drivers/staging/rtl8712/drv_types.h   | 2 +-
 drivers/staging/rtl8712/rtl871x_cmd.c | 2 +-
 drivers/staging/rtl8712/xmit_linux.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index ddab6514a549..e3e2b32e964e 100644
@@ -164,7 +164,7 @@ struct _adapter {
 	struct iw_statistics iwstats;
 	int pid; /*process id from UI*/
 	struct work_struct wk_filter_rx_ff0;
-	u8 blnEnableRxFF0Filter;
+	bool enable_rx_ff0_filter;
 	spinlock_t lockRxFF0Filter;
 	const struct firmware *fw;
 	struct usb_interface *pusb_intf;
drivers/staging/rtl8712/rtl871x_cmd.c +1 -1
index 05a78ac24987..6a8d58d97873 100644
@@ -238,7 +238,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
 	mod_timer(&pmlmepriv->scan_to_timer,
 		  jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
 	padapter->ledpriv.LedControlHandler(padapter, LED_CTL_SITE_SURVEY);
-	padapter->blnEnableRxFF0Filter = 0;
+	padapter->enable_rx_ff0_filter = false;
 	return _SUCCESS;
 }
 
drivers/staging/rtl8712/xmit_linux.c +2 -2
index e65a51c7f372..9fa1abcf5e50 100644
@@ -103,11 +103,11 @@ void r8712_SetFilter(struct work_struct *work)
 	r8712_write8(padapter, 0x117, newvalue);
 
 	spin_lock_irqsave(&padapter->lockRxFF0Filter, irqL);
-	padapter->blnEnableRxFF0Filter = 1;
+	padapter->enable_rx_ff0_filter = true;
 	spin_unlock_irqrestore(&padapter->lockRxFF0Filter, irqL);
 	do {
 		msleep(100);
-	} while (padapter->blnEnableRxFF0Filter == 1);
+	} while (padapter->enable_rx_ff0_filter == true);
 	r8712_write8(padapter, 0x117, oldvalue);
 }
 
Signature · 1 line
2.19.1
#15 lore raw

PATCH v2 9/9 staging: rtl8712: Fixed CamelCase lockRxFF0Filter

In reply to Deepak Mishra

This patch fixes CamelCase lockRxFF0Filter by renaming to lock_rx_ff0_filter in drv_types.h and related files usb_intf.c and xmit_linux.c

This was reported by checkpatch.pl

---
 drivers/staging/rtl8712/drv_types.h  | 2 +-
 drivers/staging/rtl8712/usb_intf.c   | 2 +-
 drivers/staging/rtl8712/xmit_linux.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index e3e2b32e964e..087fad7a4433 100644
@@ -165,7 +165,7 @@ struct _adapter {
 	int pid; /*process id from UI*/
 	struct work_struct wk_filter_rx_ff0;
 	bool enable_rx_ff0_filter;
-	spinlock_t lockRxFF0Filter;
+	spinlock_t lock_rx_ff0_filter;
 	const struct firmware *fw;
 	struct usb_interface *pusb_intf;
 	struct mutex mutex_start;
drivers/staging/rtl8712/usb_intf.c +1 -1
index 200a271c28e1..d0daae0b8299 100644
@@ -571,7 +571,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
 	/* step 6. Load the firmware asynchronously */
 	if (rtl871x_load_fw(padapter))
 		goto error;
-	spin_lock_init(&padapter->lockRxFF0Filter);
+	spin_lock_init(&padapter->lock_rx_ff0_filter);
 	mutex_init(&padapter->mutex_start);
 	return 0;
 error:
drivers/staging/rtl8712/xmit_linux.c +2 -2
index 9fa1abcf5e50..1b52be50c04c 100644
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
 	newvalue = oldvalue & 0xfe;
 	r8712_write8(padapter, 0x117, newvalue);
 
-	spin_lock_irqsave(&padapter->lockRxFF0Filter, irqL);
+	spin_lock_irqsave(&padapter->lock_rx_ff0_filter, irqL);
 	padapter->enable_rx_ff0_filter = true;
-	spin_unlock_irqrestore(&padapter->lockRxFF0Filter, irqL);
+	spin_unlock_irqrestore(&padapter->lock_rx_ff0_filter, irqL);
 	do {
 		msleep(100);
 	} while (padapter->enable_rx_ff0_filter == true);
Signature · 1 line
2.19.1
maintainer
#2 lore raw

Re: [PATCH v2 1/9] staging: rtl8712: Fixed CamelCase rename ImrContent to imr_content

In reply to Deepak Mishra
Quoted 17 lines · Deepak Mishra

This patch renames CamelCase ImrContent to imr_content in struct _adapter and related files drv_types.h, rtl871x_mp_ioctl.c, rtl871x_pwrctrl.h

CHECK: Avoid CamelCase: <ImrContent>

---
 drivers/staging/rtl8712/drv_types.h        | 2 +-
 drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 2 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/drv_types.h +0 -0
index 9ae86631fa8b..89ebb5a49d25 100644

drivers/staging/rtl8712/drv_types.h struct _adapter { · line 155

Quoted 8 lines
drivers/staging/rtl8712/drv_types.h +1 -1
@@ -149,7 +149,7 @@ struct _adapter {
 	bool	surprise_removed;
 	bool	suspended;
 	u32	IsrContent;
-	u32	ImrContent;
+	u32	imr_content;
 	u8	EepromAddressSize;
 	u8	hw_init_completed;
 	struct task_struct *cmdThread;

This field is never used? Why not just delete it?

drivers/staging/rtl8712/rtl871x_mp_ioctl.c uint oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) · line 668

Quoted 10 lines
drivers/staging/rtl8712/rtl871x_mp_ioctl.c +1 -1
index 588346da1412..4cf9d3afd2c5 100644
@@ -665,7 +665,7 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
 		if ((status == RNDIS_STATUS_SUCCESS) &&
 		    (RegRWStruct->offset == HIMR) &&
 		    (RegRWStruct->width == 4))
-			Adapter->ImrContent = RegRWStruct->value;
+			Adapter->imr_content = RegRWStruct->value;

It is set and never read? Please remove.

thanks,

greg k-h

maintainer
#6 lore raw

Re: [PATCH v2 4/9] staging: rtl8712: Fixed CamelCase renames evtThread to evt_thread

In reply to Deepak Mishra
Quoted 14 lines · Deepak Mishra

This patch fixes CamelCase renames evtThread to evt_thread in struct _adapter as reported by checkpatch.pl
CHECK: Avoid CamelCase: <evtThread>

---
 drivers/staging/rtl8712/drv_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/drv_types.h +0 -0
index c6faafb13bdf..5360f049088a 100644

drivers/staging/rtl8712/drv_types.h struct _adapter { · line 156

Quoted 5 lines
drivers/staging/rtl8712/drv_types.h +1 -1
@@ -153,7 +153,7 @@ struct _adapter {
 	u8	eeprom_address_size;
 	u8	hw_init_completed;
 	struct task_struct *cmd_thread;
-	pid_t evtThread;
+	pid_t evt_thread;

If this is never used, please delete it.

thanks,

greg k-h

maintainer
#8 lore raw

Re: [PATCH v2 5/9] staging: rtl8712: Fixed CamelCase renames IsrContent to isr_content

In reply to Deepak Mishra
Quoted 13 lines · Deepak Mishra

This patch fixes CamelCase IsrContent to isr_content as suggested by checkpatch.pl

---
 drivers/staging/rtl8712/drv_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/drv_types.h +0 -0
index 5360f049088a..a5060a020b2b 100644

drivers/staging/rtl8712/drv_types.h struct _adapter { · line 154

Quoted 8 lines
drivers/staging/rtl8712/drv_types.h +1 -1
@@ -148,7 +148,7 @@ struct _adapter {
 	bool	driver_stopped;
 	bool	surprise_removed;
 	bool	suspended;
-	u32	IsrContent;
+	u32	isr_content;
 	u32	imr_content;
 	u8	eeprom_address_size;
 	u8	hw_init_completed;

Same comment here, just remove unused variables. Is this structure even ever used anywhere?

thanks,

greg k-h

maintainer
#10 lore raw

Re: [PATCH v2 6/9] staging: rtl8712: Fixed CamelCase renames xmitThread and recvThread

In reply to Deepak Mishra
Quoted 14 lines · Deepak Mishra

This patch fixes CamelCase as reported by checkpatch.pl xmitThread renamed to xmit_thread
recvThread renamed to recv_thread

---
 drivers/staging/rtl8712/drv_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8712/drv_types.h +0 -0
index a5060a020b2b..1f8aa0358b77 100644

drivers/staging/rtl8712/drv_types.h struct _adapter { · line 161

Quoted 10 lines
drivers/staging/rtl8712/drv_types.h +2 -2
@@ -154,8 +154,8 @@ struct _adapter {
 	u8	hw_init_completed;
 	struct task_struct *cmd_thread;
 	pid_t evt_thread;
-	struct task_struct *xmitThread;
-	pid_t recvThread;
+	struct task_struct *xmit_thread;
+	pid_t recv_thread;
 	uint (*dvobj_init)(struct _adapter *adapter);
 	void (*dvobj_deinit)(struct _adapter *adapter);
 	struct net_device *pnetdev;

Again, please just remove the fields entirely.

thanks,

greg k-h

maintainer
#13 lore raw

Re: [PATCH v2 8/9] staging: rtl8712: fixed enable_rx_ff0_filter as bool and CamelCase

In reply to Deepak Mishra
Quoted 46 lines · Deepak Mishra

This patch fixes CamelCase blnEnableRxFF0Filter by renaming it to enable_rx_ff0_filter in drv_types.h and related files rtl871x_cmd.c xmit_linux.c
It was reported by checkpatch.pl

This fix also makes enable_rx_ff0_filter a bool and uses true false than previously used u8 as suggested by [email protected]

---
 drivers/staging/rtl8712/drv_types.h   | 2 +-
 drivers/staging/rtl8712/rtl871x_cmd.c | 2 +-
 drivers/staging/rtl8712/xmit_linux.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index ddab6514a549..e3e2b32e964e 100644
@@ -164,7 +164,7 @@ struct _adapter {
 	struct iw_statistics iwstats;
 	int pid; /*process id from UI*/
 	struct work_struct wk_filter_rx_ff0;
-	u8 blnEnableRxFF0Filter;
+	bool enable_rx_ff0_filter;
 	spinlock_t lockRxFF0Filter;
 	const struct firmware *fw;
 	struct usb_interface *pusb_intf;
drivers/staging/rtl8712/rtl871x_cmd.c +1 -1
index 05a78ac24987..6a8d58d97873 100644
@@ -238,7 +238,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
 	mod_timer(&pmlmepriv->scan_to_timer,
 		  jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
 	padapter->ledpriv.LedControlHandler(padapter, LED_CTL_SITE_SURVEY);
-	padapter->blnEnableRxFF0Filter = 0;
+	padapter->enable_rx_ff0_filter = false;
 	return _SUCCESS;
 }
 
drivers/staging/rtl8712/xmit_linux.c +0 -0
index e65a51c7f372..9fa1abcf5e50 100644

drivers/staging/rtl8712/xmit_linux.c void r8712_SetFilter(struct work_struct *work) · line 110

Quoted 10 lines
drivers/staging/rtl8712/xmit_linux.c +2 -2
@@ -103,11 +103,11 @@ void r8712_SetFilter(struct work_struct *work)
 	r8712_write8(padapter, 0x117, newvalue);
 
 	spin_lock_irqsave(&padapter->lockRxFF0Filter, irqL);
-	padapter->blnEnableRxFF0Filter = 1;
+	padapter->enable_rx_ff0_filter = true;
 	spin_unlock_irqrestore(&padapter->lockRxFF0Filter, irqL);
 	do {
 		msleep(100);
-	} while (padapter->blnEnableRxFF0Filter == 1);
+	} while (padapter->enable_rx_ff0_filter == true);

That is horrible, and I'm amazed it ever even works. Please fix this properly, spinning on a random variable is not how you do synchronization in the kernel.

thanks,

greg k-h

#14 lore raw

Re: [PATCH v2 8/9] staging: rtl8712: fixed enable_rx_ff0_filter as bool and CamelCase

Quoted 49 lines · Greg KH
Quoted 48 lines · Deepak Mishra

This patch fixes CamelCase blnEnableRxFF0Filter by renaming it to enable_rx_ff0_filter in drv_types.h and related files rtl871x_cmd.c xmit_linux.c
It was reported by checkpatch.pl

This fix also makes enable_rx_ff0_filter a bool and uses true false than previously used u8 as suggested by [email protected]

---
  drivers/staging/rtl8712/drv_types.h   | 2 +-
  drivers/staging/rtl8712/rtl871x_cmd.c | 2 +-
  drivers/staging/rtl8712/xmit_linux.c  | 4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/drv_types.h +1 -1
index ddab6514a549..e3e2b32e964e 100644
@@ -164,7 +164,7 @@ struct _adapter {
  	struct iw_statistics iwstats;
  	int pid; /*process id from UI*/
  	struct work_struct wk_filter_rx_ff0;
-	u8 blnEnableRxFF0Filter;
+	bool enable_rx_ff0_filter;
  	spinlock_t lockRxFF0Filter;
  	const struct firmware *fw;
  	struct usb_interface *pusb_intf;
drivers/staging/rtl8712/rtl871x_cmd.c +1 -1
index 05a78ac24987..6a8d58d97873 100644
@@ -238,7 +238,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
  	mod_timer(&pmlmepriv->scan_to_timer,
  		  jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
  	padapter->ledpriv.LedControlHandler(padapter, LED_CTL_SITE_SURVEY);
-	padapter->blnEnableRxFF0Filter = 0;
+	padapter->enable_rx_ff0_filter = false;
  	return _SUCCESS;
  }
 
drivers/staging/rtl8712/xmit_linux.c +0 -0
index e65a51c7f372..9fa1abcf5e50 100644
@@ -103,11 +103,11 @@ void r8712_SetFilter(struct work_struct *work)
  	r8712_write8(padapter, 0x117, newvalue);
 
Quoted 11 lines

drivers/staging/rtl8712/xmit_linux.c void r8712_SetFilter(struct work_struct *work) · line 110

Quoted 8 lines
drivers/staging/rtl8712/xmit_linux.c +2 -2
  	spin_lock_irqsave(&padapter->lockRxFF0Filter, irqL);
-	padapter->blnEnableRxFF0Filter = 1;
+	padapter->enable_rx_ff0_filter = true;
  	spin_unlock_irqrestore(&padapter->lockRxFF0Filter, irqL);
  	do {
  		msleep(100);
-	} while (padapter->blnEnableRxFF0Filter == 1);
+	} while (padapter->enable_rx_ff0_filter == true);

That is horrible, and I'm amazed it ever even works. Please fix this properly, spinning on a random variable is not how you do synchronization in the kernel.

I agree and will submit a different fix for this.

I am submitting a patchset v3 for removal of unused variables and CamelCase fix for now.

Thanks.

Deepak Mishra

Quoted 3 lines

thanks,

greg k-h