Skip to contentSkip to conversation

staging: rtl8712: cleanup struct _adapter

PATCH New Deepak Mishra 1 participant 3 messages Jun 12, 2019 Staging

lore
Share & tools
lore
#0 lore raw

cover 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(-)
Signature · 1 line
2.19.1
#1 lore raw

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.

---
 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 c36a5ef3ee5d..79d10b6fbfda 100644
@@ -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;
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 223a4eba4bf4..d8307bcc63f5 100644
@@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work)
 	newvalue = oldvalue & 0xfe;
 	r8712_write8(adapter, 0x117, newvalue);
 
-	spin_lock_irqsave(&adapter->lockRxFF0Filter, irqL);
+	spin_lock_irqsave(&adapter->lock_rx_ff0_filter, irqL);
 	adapter->blnEnableRxFF0Filter = 1;
-	spin_unlock_irqrestore(&adapter->lockRxFF0Filter, irqL);
+	spin_unlock_irqrestore(&adapter->lock_rx_ff0_filter, irqL);
 	do {
 		msleep(100);
 	} while (adapter->blnEnableRxFF0Filter == 1);
Signature · 1 line
2.19.1
#2 lore raw

PATCH 2/2 staging: rtl8712: Fixed CamelCase wkFilterRxFF0 renamed to wk_filter_rx_ff0

In reply to Deepak Mishra

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.

---
 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 79d10b6fbfda..0c4325073c63 100644
@@ -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;
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 d8307bcc63f5..dc03f0d0c85d 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 *adapter = container_of(work, struct _adapter,
-						wkFilterRxFF0);
+						wk_filter_rx_ff0);
 	u8  oldvalue = 0x00, newvalue = 0x00;
 	unsigned long irqL;
 
Signature · 1 line
2.19.1