[PATCH 1/2] staging: rtl8712: Fixed CamelCase lockRxFF0Filter renamed to lock_rx_ff0_filter
In process of cleaning up struct _adapter in drv_types.h, lockRxFF0Filter
is renamed to to lock_rx_ff0_filter to fix a checkpatch reported issue.
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index c36a5ef3ee5d..79d10b6fbfda 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -160,7 +160,7 @@ struct _adapter {
int pid; /*process id from UI*/
struct work_struct wkFilterRxFF0;
u8 blnEnableRxFF0Filter;
- spinlock_t lockRxFF0Filter;
+ spinlock_t lock_rx_ff0_filter;
const struct firmware *fw;
struct usb_interface *pusb_intf;
struct mutex mutex_start;
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 200a271c28e1..d0daae0b8299 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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(>lockRxFF0Filter);
+ spin_lock_init(>lock_rx_ff0_filter);
mutex_init(>mutex_start);
return 0;
error:
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 223a4eba4bf4..d8307bcc63f5 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
newvalue = oldvalue & 0xfe;
r8712_write8(adapter, 0x117, newvalue);
- spin_lock_irqsave(>lockRxFF0Filter, irqL);
+ spin_lock_irqsave(>lock_rx_ff0_filter, irqL);
adapter->blnEnableRxFF0Filter = 1;
- spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
+ spin_unlock_irqrestore(>lock_rx_ff0_filter, irqL);
do {
msleep(100);
} while (adapter->blnEnableRxFF0Filter == 1);
--
2.19.1
[PATCH 0/2] staging: rtl8712: cleanup struct _adapter
In process of cleaning up rtl8712 struct _adapter in drv_types.h I have fixed the camelcasing of lockRxFF0Filter and wkFilterRxFF0 Deepak Mishra (2): staging: rtl8712: Fixed CamelCase lockRxFF0Filter renamed to lock_rx_ff0_filter staging: rtl8712: Fixed CamelCase wkFilterRxFF0 renamed to wk_filter_rx_ff0 drivers/staging/rtl8712/drv_types.h| 4 ++-- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 2 +- drivers/staging/rtl8712/xmit_linux.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) -- 2.19.1
[PATCH 2/2] staging: rtl8712: Fixed CamelCase wkFilterRxFF0 renamed to wk_filter_rx_ff0
In process of cleaning up struct _adapter in drv_types.h, wkFilterRxFF0
is renamed to to wk_filter_rx_ff0 to fix a checkpatch reported issue.
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 79d10b6fbfda..0c4325073c63 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -158,7 +158,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 lock_rx_ff0_filter;
const struct firmware *fw;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c
b/drivers/staging/rtl8712/rtl871x_xmit.c
index bfd5538a4652..5d63d2721eb6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
pxmitbuf++;
}
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
- INIT_WORK(>wkFilterRxFF0, r8712_SetFilter);
+ INIT_WORK(>wk_filter_rx_ff0, r8712_SetFilter);
alloc_hwxmits(padapter);
init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
tasklet_init(>xmit_tasklet,
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index d8307bcc63f5..dc03f0d0c85d 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -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 *adapter = container_of(work, struct _adapter,
- wkFilterRxFF0);
+ wk_filter_rx_ff0);
u8 oldvalue = 0x00, newvalue = 0x00;
unsigned long irqL;
--
2.19.1
[PATCH v5 4/6] staging: rtl8712: removed unused variables from struct _adapter
This patch removed following unused member variables from struct _adapter
IsrContent, xmitThread, evtThread, recvThread
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 0c722e9c2410..c36a5ef3ee5d 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -148,13 +148,9 @@ struct _adapter {
booldriver_stopped;
boolsurprise_removed;
boolsuspended;
- u32 IsrContent;
u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmd_thread;
- pid_t evtThread;
- struct task_struct *xmitThread;
- pid_t recvThread;
uint (*dvobj_init)(struct _adapter *adapter);
void (*dvobj_deinit)(struct _adapter *adapter);
struct net_device *pnetdev;
--
2.19.1
[PATCH v5 6/6] staging: rtl8712: Renamed CamelCase lockRxFF0Filter to lock_rx_ff0_filter
This patch renames CamelCase variable lockRxFF0Filter to
lock_rx_ff0_filter in drv_types.h, usb_intf.c and xmit_linux.c
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 7838c945d622..0c4325073c63 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -160,7 +160,7 @@ struct _adapter {
int pid; /*process id from UI*/
struct work_struct wk_filter_rx_ff0;
u8 blnEnableRxFF0Filter;
- spinlock_t lockRxFF0Filter;
+ spinlock_t lock_rx_ff0_filter;
const struct firmware *fw;
struct usb_interface *pusb_intf;
struct mutex mutex_start;
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 200a271c28e1..d0daae0b8299 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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(>lockRxFF0Filter);
+ spin_lock_init(>lock_rx_ff0_filter);
mutex_init(>mutex_start);
return 0;
error:
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index e65a51c7f372..71100613aeb3 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
newvalue = oldvalue & 0xfe;
r8712_write8(padapter, 0x117, newvalue);
- spin_lock_irqsave(>lockRxFF0Filter, irqL);
+ spin_lock_irqsave(>lock_rx_ff0_filter, irqL);
padapter->blnEnableRxFF0Filter = 1;
- spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
+ spin_unlock_irqrestore(>lock_rx_ff0_filter, irqL);
do {
msleep(100);
} while (padapter->blnEnableRxFF0Filter == 1);
--
2.19.1
[PATCH v5 3/6] staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread
This patch renames CamelCase cmdThread to cmd_thread in struct _adapter in
drv_types.h and in os_intfs.c
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
drivers/staging/rtl8712/os_intfs.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9fbd19f03ca9..0c722e9c2410 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -151,7 +151,7 @@ struct _adapter {
u32 IsrContent;
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;
diff --git a/drivers/staging/rtl8712/os_intfs.c
b/drivers/staging/rtl8712/os_intfs.c
index c962696c9822..1653b36c4bfd 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -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(>cmdpriv.cmd_queue_comp);
- if (padapter->cmdThread)
+ if (padapter->cmd_thread)
wait_for_completion_interruptible(completion);
padapter->cmdpriv.cmd_seq = 1;
}
--
2.19.1
[PATCH v5 2/6] staging: rtl8712: Removed redundant code from function oid_rt_pro_write_register_hdl
In function oid_rt_pro_write_register_hdl, Adapter->ImrContent is
assigned with RegRWStruct->value but Adapter->ImrContent is never used
anywhere else. So those lines has no impact and are removed removed.
As that was the only place where ImrContent was used, so the member
variable is removed from the structure _adapter
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h| 1 -
drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 -
2 files changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index d4262a68dd4d..9fbd19f03ca9 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -149,7 +149,6 @@ struct _adapter {
boolsurprise_removed;
boolsuspended;
u32 IsrContent;
- u32 ImrContent;
u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 588346da1412..add6c18195d6 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -661,11 +661,6 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv
*poid_par_priv)
status = RNDIS_STATUS_NOT_ACCEPTED;
break;
}
-
- if ((status == RNDIS_STATUS_SUCCESS) &&
- (RegRWStruct->offset == HIMR) &&
- (RegRWStruct->width == 4))
- Adapter->ImrContent = RegRWStruct->value;
}
return status;
}
--
2.19.1
[PATCH v5 5/6] staging: rtl8712: Renamed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0
This patch renames CamelCase variable wkFilterRxFF0 to wk_filter_rx_ff0 in
drv_types.h, rtl871x_xmit.c and xmit_linux.c
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index c36a5ef3ee5d..7838c945d622 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -158,7 +158,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;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c
b/drivers/staging/rtl8712/rtl871x_xmit.c
index bfd5538a4652..5d63d2721eb6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
pxmitbuf++;
}
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
- INIT_WORK(>wkFilterRxFF0, r8712_SetFilter);
+ INIT_WORK(>wk_filter_rx_ff0, r8712_SetFilter);
alloc_hwxmits(padapter);
init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
tasklet_init(>xmit_tasklet,
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 8bcb0775411f..e65a51c7f372 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -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;
--
2.19.1
[PATCH v5 0/6] staging: rtl8712: cleanup struct _adapter
In process of cleaning up rtl8712 struct _adapter in drv_types.h I have tried to remove some unused variables and redundant lines of code associated with those variables. I have also fixed some CamelCase reported by checkpatch.pl Following review comments from previous versions are addressed 1. Separated CamelCase fix for lockRxFF0Filter and wkFilterRxFF0 to separate patches 2. Separated CamelCase EepromAddressSizefrom removal of unused variable ImrContent two different patches. 3. Remove redundant code along with removing variable ImrContent from the structure 4. Instead of fixing CamelCase issue, remove the variables not in use. 5. Fixing of CamelCase of variable blnEnableRxFF0Filter is removed from this patch set as spinning on a random variable for synchronization needs to be fixed separately Deepak Mishra (6): staging: rtl8712: Fixed CamelCase for EepromAddressSize staging: rtl8712: Removed redundant code from function oid_rt_pro_write_register_hdl staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread staging: rtl8712: removed unused variables from struct _adapter staging: rtl8712: Renamed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0 staging: rtl8712: Renamed CamelCase lockRxFF0Filter to lock_rx_ff0_filter drivers/staging/rtl8712/drv_types.h| 13 - drivers/staging/rtl8712/os_intfs.c | 6 +++--- drivers/staging/rtl8712/rtl871x_eeprom.c | 6 +++--- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 - drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 4 ++-- drivers/staging/rtl8712/xmit_linux.c | 6 +++--- 7 files changed, 16 insertions(+), 26 deletions(-) -- 2.19.1
[PATCH v5 1/6] staging: rtl8712: Fixed CamelCase for EepromAddressSize
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
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9ae86631fa8b..d4262a68dd4d 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -150,7 +150,7 @@ struct _adapter {
boolsuspended;
u32 IsrContent;
u32 ImrContent;
- u8 EepromAddressSize;
+ u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
pid_t evtThread;
diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c
b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 0027d8eb22fa..221bf92e1b1c 100644
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -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);
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 7478bbd3de78..200a271c28e1 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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 = >altsetting[0];
piface_desc = _iface->desc;
pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
--
2.19.1
[PATCH v4 6/6] staging: rtl8712: Renamed CamelCase lockRxFF0Filter to lock_rx_ff0_filter
This patch renames CamelCase variable lockRxFF0Filter to
lock_rx_ff0_filter in drv_types.h, usb_intf.c and xmit_linux.c
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 7838c945d622..0c4325073c63 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -160,7 +160,7 @@ struct _adapter {
int pid; /*process id from UI*/
struct work_struct wk_filter_rx_ff0;
u8 blnEnableRxFF0Filter;
- spinlock_t lockRxFF0Filter;
+ spinlock_t lock_rx_ff0_filter;
const struct firmware *fw;
struct usb_interface *pusb_intf;
struct mutex mutex_start;
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 200a271c28e1..d0daae0b8299 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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(>lockRxFF0Filter);
+ spin_lock_init(>lock_rx_ff0_filter);
mutex_init(>mutex_start);
return 0;
error:
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index e65a51c7f372..71100613aeb3 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
newvalue = oldvalue & 0xfe;
r8712_write8(padapter, 0x117, newvalue);
- spin_lock_irqsave(>lockRxFF0Filter, irqL);
+ spin_lock_irqsave(>lock_rx_ff0_filter, irqL);
padapter->blnEnableRxFF0Filter = 1;
- spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
+ spin_unlock_irqrestore(>lock_rx_ff0_filter, irqL);
do {
msleep(100);
} while (padapter->blnEnableRxFF0Filter == 1);
--
2.19.1
[PATCH v4 5/6] staging: rtl8712: Renamed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0
This patch renames CamelCase variable wkFilterRxFF0 to wk_filter_rx_ff0 in
drv_types.h, rtl871x_xmit.c and xmit_linux.c
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index c36a5ef3ee5d..7838c945d622 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -158,7 +158,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;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c
b/drivers/staging/rtl8712/rtl871x_xmit.c
index bfd5538a4652..5d63d2721eb6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
pxmitbuf++;
}
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
- INIT_WORK(>wkFilterRxFF0, r8712_SetFilter);
+ INIT_WORK(>wk_filter_rx_ff0, r8712_SetFilter);
alloc_hwxmits(padapter);
init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
tasklet_init(>xmit_tasklet,
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 8bcb0775411f..e65a51c7f372 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -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;
--
2.19.1
[PATCH v4 3/6] staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread
This patch renames CamelCase cmdThread to cmd_thread in struct _adapter in
drv_types.h and in os_intfs.c
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
drivers/staging/rtl8712/os_intfs.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9fbd19f03ca9..0c722e9c2410 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -151,7 +151,7 @@ struct _adapter {
u32 IsrContent;
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;
diff --git a/drivers/staging/rtl8712/os_intfs.c
b/drivers/staging/rtl8712/os_intfs.c
index c962696c9822..1653b36c4bfd 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -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(>cmdpriv.cmd_queue_comp);
- if (padapter->cmdThread)
+ if (padapter->cmd_thread)
wait_for_completion_interruptible(completion);
padapter->cmdpriv.cmd_seq = 1;
}
--
2.19.1
[PATCH v4 4/6] staging: rtl8712: removed unused variables from struct _adapter
This patch removed following unused member variables from struct _adapter
IsrContent, xmitThread, evtThread, recvThread
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 0c722e9c2410..c36a5ef3ee5d 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -148,13 +148,9 @@ struct _adapter {
booldriver_stopped;
boolsurprise_removed;
boolsuspended;
- u32 IsrContent;
u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmd_thread;
- pid_t evtThread;
- struct task_struct *xmitThread;
- pid_t recvThread;
uint (*dvobj_init)(struct _adapter *adapter);
void (*dvobj_deinit)(struct _adapter *adapter);
struct net_device *pnetdev;
--
2.19.1
[PATCH v4 2/6] staging: rtl8712: Removed redundant code from function oid_rt_pro_write_register_hdl
In function oid_rt_pro_write_register_hdl, Adapter->ImrContent is
assigned with RegRWStruct->value but Adapter->ImrContent is never used
anywhere else. So those lines has no impact and are removed removed.
As that was the only place where ImrContent was used, so the member
variable is removed from the structure _adapter
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h| 1 -
drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 -
2 files changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index d4262a68dd4d..9fbd19f03ca9 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -149,7 +149,6 @@ struct _adapter {
boolsurprise_removed;
boolsuspended;
u32 IsrContent;
- u32 ImrContent;
u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 588346da1412..add6c18195d6 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -661,11 +661,6 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv
*poid_par_priv)
status = RNDIS_STATUS_NOT_ACCEPTED;
break;
}
-
- if ((status == RNDIS_STATUS_SUCCESS) &&
- (RegRWStruct->offset == HIMR) &&
- (RegRWStruct->width == 4))
- Adapter->ImrContent = RegRWStruct->value;
}
return status;
}
--
2.19.1
[PATCH v4 0/6] staging: rtl8712: cleanup struct _adapter
In process of cleaning up rtl8712 struct _adapter in drv_types.h I have tried to remove some unused variables and redundant lines of code associated with those variables. I have also fixed some CamelCase reported by checkpatch.pl Deepak Mishra (6): staging: rtl8712: Fixed CamelCase for EepromAddressSize staging: rtl8712: Removed redundant code from function oid_rt_pro_write_register_hdl staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread staging: rtl8712: removed unused variables from struct _adapter staging: rtl8712: Renamed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0 staging: rtl8712: Renamed CamelCase lockRxFF0Filter to lock_rx_ff0_filter drivers/staging/rtl8712/drv_types.h| 13 - drivers/staging/rtl8712/os_intfs.c | 6 +++--- drivers/staging/rtl8712/rtl871x_eeprom.c | 6 +++--- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 - drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 4 ++-- drivers/staging/rtl8712/xmit_linux.c | 6 +++--- 7 files changed, 16 insertions(+), 26 deletions(-) -- 2.19.1
[PATCH v4 1/6] staging: rtl8712: Fixed CamelCase for EepromAddressSize
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
This was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9ae86631fa8b..d4262a68dd4d 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -150,7 +150,7 @@ struct _adapter {
boolsuspended;
u32 IsrContent;
u32 ImrContent;
- u8 EepromAddressSize;
+ u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
pid_t evtThread;
diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c
b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 0027d8eb22fa..221bf92e1b1c 100644
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -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);
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 7478bbd3de78..200a271c28e1 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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 = >altsetting[0];
piface_desc = _iface->desc;
pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
--
2.19.1
[PATCH v3 3/4] staging: rtl8712: removed unused variables from struct _adapter
This patch removed following unused variables from struct _adapter
IsrContent, xmitThread, evtThread, recvThread
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 0c722e9c2410..c36a5ef3ee5d 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -148,13 +148,9 @@ struct _adapter {
booldriver_stopped;
boolsurprise_removed;
boolsuspended;
- u32 IsrContent;
u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmd_thread;
- pid_t evtThread;
- struct task_struct *xmitThread;
- pid_t recvThread;
uint (*dvobj_init)(struct _adapter *adapter);
void (*dvobj_deinit)(struct _adapter *adapter);
struct net_device *pnetdev;
--
2.19.1
[PATCH v3 0/4] staging: rtl8712: cleanup struct _adapter
In process of cleaning up rtl8712 struct _adapter in drv_types.h I have tried to remove some unused variables and redundant lines of code associated with those variables. I have also fixed some CamelCase reported by checkpatch.pl There are some other code like spinning on a random variable which I am investigating and will clean up in a different patch set. Deepak Mishra (4): staging: rtl8712: Fixed CamelCase for EepromAddressSize and removed unused variable staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread staging: rtl8712: removed unused variables from struct _adapter staging: rtl8712: Fixed CamelCase wkFilterRxFF0 and lockRxFF0Filter drivers/staging/rtl8712/drv_types.h| 11 +++ drivers/staging/rtl8712/os_intfs.c | 6 +++--- drivers/staging/rtl8712/rtl871x_eeprom.c | 6 +++--- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 - drivers/staging/rtl8712/rtl871x_pwrctrl.h | 1 - drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 4 ++-- drivers/staging/rtl8712/xmit_linux.c | 6 +++--- 8 files changed, 15 insertions(+), 26 deletions(-) -- 2.19.1
[PATCH v3 1/4] staging: rtl8712: Fixed CamelCase for EepromAddressSize and removed unused variable
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:
This patch removed unused variable ImrContent from struct _adapter and
struct pwrctrl_priv and redundant lines from rtl871x_mp_ioctl.c
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h| 3 +--
drivers/staging/rtl8712/rtl871x_eeprom.c | 6 +++---
drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 -
drivers/staging/rtl8712/rtl871x_pwrctrl.h | 1 -
drivers/staging/rtl8712/usb_intf.c | 2 +-
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9ae86631fa8b..9fbd19f03ca9 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -149,8 +149,7 @@ struct _adapter {
boolsurprise_removed;
boolsuspended;
u32 IsrContent;
- u32 ImrContent;
- u8 EepromAddressSize;
+ u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
pid_t evtThread;
diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c
b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 0027d8eb22fa..221bf92e1b1c 100644
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -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);
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 588346da1412..add6c18195d6 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -661,11 +661,6 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv
*poid_par_priv)
status = RNDIS_STATUS_NOT_ACCEPTED;
break;
}
-
- if ((status == RNDIS_STATUS_SUCCESS) &&
- (RegRWStruct->offset == HIMR) &&
- (RegRWStruct->width == 4))
- Adapter->ImrContent = RegRWStruct->value;
}
return status;
}
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
index 11b5034f203d..2dd9f558d351 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
@@ -88,7 +88,6 @@ structpwrctrl_priv {
uint pwr_mode;
uint smart_ps;
uint alives;
- uint ImrContent;/* used to store original imr. */
uint bSleep; /* sleep -> active is different from active -> sleep. */
struct work_struct SetPSModeWorkItem;
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 7478bbd3de78..200a271c28e1 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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 = >altsetting[0];
piface_desc = _iface->desc;
pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
--
2.19.1
[PATCH v3 4/4] staging: rtl8712: Fixed CamelCase wkFilterRxFF0 and lockRxFF0Filter
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
This patch renames CamelCase variable lockRxFF0Filter to lock_rx_ff0_filter
in drv_types.h and related files usb_intf.c and xmit_linux.c as
reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h| 2 +-
drivers/staging/rtl8712/rtl871x_xmit.c | 2 +-
drivers/staging/rtl8712/usb_intf.c | 2 +-
drivers/staging/rtl8712/xmit_linux.c | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index c36a5ef3ee5d..7838c945d622 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -158,7 +158,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;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c
b/drivers/staging/rtl8712/rtl871x_xmit.c
index bfd5538a4652..5d63d2721eb6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
pxmitbuf++;
}
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
- INIT_WORK(>wkFilterRxFF0, r8712_SetFilter);
+ INIT_WORK(>wk_filter_rx_ff0, r8712_SetFilter);
alloc_hwxmits(padapter);
init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
tasklet_init(>xmit_tasklet,
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 200a271c28e1..d0daae0b8299 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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(>lockRxFF0Filter);
+ spin_lock_init(>lock_rx_ff0_filter);
mutex_init(>mutex_start);
return 0;
error:
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 8bcb0775411f..71100613aeb3 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -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;
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
newvalue = oldvalue & 0xfe;
r8712_write8(padapter, 0x117, newvalue);
- spin_lock_irqsave(>lockRxFF0Filter, irqL);
+ spin_lock_irqsave(>lock_rx_ff0_filter, irqL);
padapter->blnEnableRxFF0Filter = 1;
- spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
+ spin_unlock_irqrestore(>lock_rx_ff0_filter, irqL);
do {
msleep(100);
} while (padapter->blnEnableRxFF0Filter == 1);
--
2.19.1
[PATCH v3 2/4] staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread
This patch renames CamelCase cmdThread to cmd_thread in struct _adapter and
related
files drv_types.h,os_intfs.c
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
drivers/staging/rtl8712/os_intfs.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9fbd19f03ca9..0c722e9c2410 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -151,7 +151,7 @@ struct _adapter {
u32 IsrContent;
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;
diff --git a/drivers/staging/rtl8712/os_intfs.c
b/drivers/staging/rtl8712/os_intfs.c
index c962696c9822..1653b36c4bfd 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -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(>cmdpriv.cmd_queue_comp);
- if (padapter->cmdThread)
+ if (padapter->cmd_thread)
wait_for_completion_interruptible(completion);
padapter->cmdpriv.cmd_seq = 1;
}
--
2.19.1
[PATCH v2 9/9] staging: rtl8712: Fixed CamelCase lockRxFF0Filter
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
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index e3e2b32e964e..087fad7a4433 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 200a271c28e1..d0daae0b8299 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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(>lockRxFF0Filter);
+ spin_lock_init(>lock_rx_ff0_filter);
mutex_init(>mutex_start);
return 0;
error:
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 9fa1abcf5e50..1b52be50c04c 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
newvalue = oldvalue & 0xfe;
r8712_write8(padapter, 0x117, newvalue);
- spin_lock_irqsave(>lockRxFF0Filter, irqL);
+ spin_lock_irqsave(>lock_rx_ff0_filter, irqL);
padapter->enable_rx_ff0_filter = true;
- spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
+ spin_unlock_irqrestore(>lock_rx_ff0_filter, irqL);
do {
msleep(100);
} while (padapter->enable_rx_ff0_filter == true);
--
2.19.1
[PATCH v2 8/9] staging: rtl8712: fixed enable_rx_ff0_filter as bool and CamelCase
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 j...@perches.com
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index ddab6514a549..e3e2b32e964e 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c
b/drivers/staging/rtl8712/rtl871x_cmd.c
index 05a78ac24987..6a8d58d97873 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -238,7 +238,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
mod_timer(>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;
}
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index e65a51c7f372..9fa1abcf5e50 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -103,11 +103,11 @@ void r8712_SetFilter(struct work_struct *work)
r8712_write8(padapter, 0x117, newvalue);
spin_lock_irqsave(>lockRxFF0Filter, irqL);
- padapter->blnEnableRxFF0Filter = 1;
+ padapter->enable_rx_ff0_filter = true;
spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
do {
msleep(100);
- } while (padapter->blnEnableRxFF0Filter == 1);
+ } while (padapter->enable_rx_ff0_filter == true);
r8712_write8(padapter, 0x117, oldvalue);
}
--
2.19.1
[PATCH v2 4/9] staging: rtl8712: Fixed CamelCase renames evtThread to evt_thread
This patch fixes CamelCase renames evtThread to evt_thread in struct _adapter
as reported by
checkpatch.pl
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index c6faafb13bdf..5360f049088a 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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);
--
2.19.1
[PATCH v2 3/9] staging: rtl8712: Fixed CamelCase cmdThread rename to cmd_thread
This patch renames CamelCase cmdThread to cmd_thread in struct _adapter and
related
files drv_types.h,os_intfs.c
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
drivers/staging/rtl8712/os_intfs.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 7d1178278ecc..c6faafb13bdf 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
diff --git a/drivers/staging/rtl8712/os_intfs.c
b/drivers/staging/rtl8712/os_intfs.c
index c962696c9822..1653b36c4bfd 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -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(>cmdpriv.cmd_queue_comp);
- if (padapter->cmdThread)
+ if (padapter->cmd_thread)
wait_for_completion_interruptible(completion);
padapter->cmdpriv.cmd_seq = 1;
}
--
2.19.1
[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:
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9ae86631fa8b..89ebb5a49d25 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -149,7 +149,7 @@ struct _adapter {
boolsurprise_removed;
boolsuspended;
u32 IsrContent;
- u32 ImrContent;
+ u32 imr_content;
u8 EepromAddressSize;
u8 hw_init_completed;
struct task_struct *cmdThread;
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 588346da1412..4cf9d3afd2c5 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -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;
}
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
index 11b5034f203d..cca81a3f4031 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
@@ -88,7 +88,7 @@ structpwrctrl_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;
--
2.19.1
[PATCH v2 7/9] staging: rtl8712: Fixed CamelCase wkFilterRxFF0 to wk_filter_rx_ff0 in
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
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 1f8aa0358b77..ddab6514a549 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c
b/drivers/staging/rtl8712/rtl871x_xmit.c
index bfd5538a4652..5d63d2721eb6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
pxmitbuf++;
}
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
- INIT_WORK(>wkFilterRxFF0, r8712_SetFilter);
+ INIT_WORK(>wk_filter_rx_ff0, r8712_SetFilter);
alloc_hwxmits(padapter);
init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
tasklet_init(>xmit_tasklet,
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 8bcb0775411f..e65a51c7f372 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -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;
--
2.19.1
[PATCH v2 2/9] staging: rtl8712: Fixed CamelCase EepromAddressSize rename to eeprom_address_size
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:
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 89ebb5a49d25..7d1178278ecc 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -150,7 +150,7 @@ struct _adapter {
boolsuspended;
u32 IsrContent;
u32 imr_content;
- u8 EepromAddressSize;
+ u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
pid_t evtThread;
diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c
b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 0027d8eb22fa..221bf92e1b1c 100644
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -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);
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 7478bbd3de78..200a271c28e1 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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 = >altsetting[0];
piface_desc = _iface->desc;
pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
--
2.19.1
[PATCH v2 0/9] 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(-) -- 2.19.1
[PATCH v2 5/9] staging: rtl8712: Fixed CamelCase renames IsrContent to isr_content
This patch fixes CamelCase IsrContent to isr_content as suggested by
checkpatch.pl
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 5360f049088a..a5060a020b2b 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -148,7 +148,7 @@ struct _adapter {
booldriver_stopped;
boolsurprise_removed;
boolsuspended;
- u32 IsrContent;
+ u32 isr_content;
u32 imr_content;
u8 eeprom_address_size;
u8 hw_init_completed;
--
2.19.1
[PATCH v2 6/9] staging: rtl8712: Fixed CamelCase renames xmitThread and recvThread
This patch fixes CamelCase as reported by checkpatch.pl
xmitThread renamed to xmit_thread
recvThread renamed to recv_thread
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index a5060a020b2b..1f8aa0358b77 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
--
2.19.1
Re: [PATCH 8/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
On Sat, Jun 01, 2019 at 12:26:02PM -0700, Joe Perches wrote:
> On Sun, 2019-06-02 at 00:13 +0530, Deepak Mishra wrote:
> > This patch fixes CamelCase blnEnableRxFF0Filter by renaming it
> > to bln_enable_rx_ff0_filter in drv_types.h and related files rtl871x_cmd.c
> > xmit_linux.c
>
> One could also improve this by removing the
> hungarian like bln_ prefix and simplify the
> name of the boolean variable.
>
Thank you for your suggestion and I am modifying accordingly and
sending a V2 patch.
> > diff --git a/drivers/staging/rtl8712/drv_types.h
> > b/drivers/staging/rtl8712/drv_types.h
> []
> > @@ -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;
> > + u8 bln_enable_rx_ff0_filter;
>
> e.g.:
>
> bool enable_rx_ff0_filter;
>
> > diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c
> > b/drivers/staging/rtl8712/rtl871x_cmd.c
> []
> > @@ -238,7 +238,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
> > mod_timer(>scan_to_timer,
> > jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
> > padapter->ledpriv.LedControlHandler(padapter, LED_CTL_SITE_SURVEY);
> > - padapter->blnEnableRxFF0Filter = 0;
> > + padapter->bln_enable_rx_ff0_filter = 0;
>
> padapter->enable_rx_ff0_filter = false;
>
> > diff --git a/drivers/staging/rtl8712/xmit_linux.c
> > b/drivers/staging/rtl8712/xmit_linux.c
> []
> > @@ -103,11 +103,11 @@ void r8712_SetFilter(struct work_struct *work)
> > r8712_write8(padapter, 0x117, newvalue);
> >
> > spin_lock_irqsave(>lockRxFF0Filter, irqL);
> > - padapter->blnEnableRxFF0Filter = 1;
> > + padapter->bln_enable_rx_ff0_filter = 1;
>
> padapter->enable_rx_ff0_filter = true;
>
> etc...
>
> Then you could rename padapter to adapter, and maybe
> "struct _adapter" to something more sensible like
> "struct rtl8712dev" etc...
>
Thanks for suggestion again. I am going to take it in a diferent patchset
and submit that.
> And one day, hopefully sooner than later, realtek will
> improve their driver software base and help eliminate
> all the duplicated non-style defects across the family
> of drivers for their hardware...
>
Best regards
Deepak Mishra
[PATCH 2/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase ImrContent from struct _adapter and in related
files drv_types.h, rtl871x_eeprom.c, usb_intf.c
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 89ebb5a49d25..7d1178278ecc 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -150,7 +150,7 @@ struct _adapter {
boolsuspended;
u32 IsrContent;
u32 imr_content;
- u8 EepromAddressSize;
+ u8 eeprom_address_size;
u8 hw_init_completed;
struct task_struct *cmdThread;
pid_t evtThread;
diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c
b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 0027d8eb22fa..221bf92e1b1c 100644
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -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);
diff --git a/drivers/staging/rtl8712/usb_intf.c
b/drivers/staging/rtl8712/usb_intf.c
index 7478bbd3de78..200a271c28e1 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -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 = >altsetting[0];
piface_desc = _iface->desc;
pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
--
2.19.1
[PATCH 0/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
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 Deepak Mishra (8): staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h drivers/staging/rtl8712/drv_types.h| 18 +- 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 | 2 +- drivers/staging/rtl8712/xmit_linux.c | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) -- 2.19.1
[PATCH 4/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase evtThread in struct _adapter as reported by
checkpatch.pl
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index c6faafb13bdf..5360f049088a 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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);
--
2.19.1
[PATCH 6/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase as reported by checkpatch.pl
xmitThread renamed to xmit_thread
recvThread renamed to recv_thread
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index a5060a020b2b..1f8aa0358b77 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
--
2.19.1
[PATCH 8/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase blnEnableRxFF0Filter by renaming it
to bln_enable_rx_ff0_filter in drv_types.h and related files rtl871x_cmd.c
xmit_linux.c
It was reported by checkpatch.pl
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index ddab6514a549..33caa9477f9f 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
+ u8 bln_enable_rx_ff0_filter;
spinlock_t lockRxFF0Filter;
const struct firmware *fw;
struct usb_interface *pusb_intf;
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c
b/drivers/staging/rtl8712/rtl871x_cmd.c
index 05a78ac24987..873232d0be9f 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -238,7 +238,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
mod_timer(>scan_to_timer,
jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
padapter->ledpriv.LedControlHandler(padapter, LED_CTL_SITE_SURVEY);
- padapter->blnEnableRxFF0Filter = 0;
+ padapter->bln_enable_rx_ff0_filter = 0;
return _SUCCESS;
}
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index e65a51c7f372..241c0c91122b 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -103,11 +103,11 @@ void r8712_SetFilter(struct work_struct *work)
r8712_write8(padapter, 0x117, newvalue);
spin_lock_irqsave(>lockRxFF0Filter, irqL);
- padapter->blnEnableRxFF0Filter = 1;
+ padapter->bln_enable_rx_ff0_filter = 1;
spin_unlock_irqrestore(>lockRxFF0Filter, irqL);
do {
msleep(100);
- } while (padapter->blnEnableRxFF0Filter == 1);
+ } while (padapter->bln_enable_rx_ff0_filter == 1);
r8712_write8(padapter, 0x117, oldvalue);
}
--
2.19.1
[PATCH 1/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase ImrContent from struct _adapter and in related
files drv_types.h, rtl871x_mp_ioctl.c, rtl871x_pwrctrl.h
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 9ae86631fa8b..89ebb5a49d25 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -149,7 +149,7 @@ struct _adapter {
boolsurprise_removed;
boolsuspended;
u32 IsrContent;
- u32 ImrContent;
+ u32 imr_content;
u8 EepromAddressSize;
u8 hw_init_completed;
struct task_struct *cmdThread;
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 588346da1412..4cf9d3afd2c5 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -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;
}
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
index 11b5034f203d..cca81a3f4031 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
@@ -88,7 +88,7 @@ structpwrctrl_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;
--
2.19.1
[PATCH 7/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
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
Signed-off-by: Deepak Mishra
---
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(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 1f8aa0358b77..ddab6514a549 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c
b/drivers/staging/rtl8712/rtl871x_xmit.c
index bfd5538a4652..5d63d2721eb6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -139,7 +139,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
pxmitbuf++;
}
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
- INIT_WORK(>wkFilterRxFF0, r8712_SetFilter);
+ INIT_WORK(>wk_filter_rx_ff0, r8712_SetFilter);
alloc_hwxmits(padapter);
init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
tasklet_init(>xmit_tasklet,
diff --git a/drivers/staging/rtl8712/xmit_linux.c
b/drivers/staging/rtl8712/xmit_linux.c
index 8bcb0775411f..e65a51c7f372 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -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;
--
2.19.1
[PATCH 5/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase IsrContent to isr_content as suggested by
checkpatch.pl
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 5360f049088a..a5060a020b2b 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -148,7 +148,7 @@ struct _adapter {
booldriver_stopped;
boolsurprise_removed;
boolsuspended;
- u32 IsrContent;
+ u32 isr_content;
u32 imr_content;
u8 eeprom_address_size;
u8 hw_init_completed;
--
2.19.1
[PATCH 3/8] staging: rtl8712: Fixed CamelCase in struct _adapter from drv_types.h
This patch fixes CamelCase cmdThread from struct _adapter and in related
files drv_types.h,os_intfs.c
CHECK: Avoid CamelCase:
Signed-off-by: Deepak Mishra
---
drivers/staging/rtl8712/drv_types.h | 2 +-
drivers/staging/rtl8712/os_intfs.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/drv_types.h
b/drivers/staging/rtl8712/drv_types.h
index 7d1178278ecc..c6faafb13bdf 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -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;
diff --git a/drivers/staging/rtl8712/os_intfs.c
b/drivers/staging/rtl8712/os_intfs.c
index c962696c9822..1653b36c4bfd 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -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(>cmdpriv.cmd_queue_comp);
- if (padapter->cmdThread)
+ if (padapter->cmd_thread)
wait_for_completion_interruptible(completion);
padapter->cmdpriv.cmd_seq = 1;
}
--
2.19.1
