Skip to contentSkip to conversation

staging: rtl8188eu: Remove 'semaphore allrxreturnevt' from struct recv_priv

PATCH In review [email protected] 1 participant 8 messages May 7, 2014 1 message not in the archive Staging

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1399435056-32386-1-git-send-email-y

#1 lore raw

PATCH 1/13 staging: rtl8188eu: Remove 'semaphore allrxreturnevt' from struct recv_priv

From: navin patidar <[email protected]>

Remove unused variable 'semaphore allrxreturnevt'.

---
 drivers/staging/rtl8188eu/core/rtw_recv.c    |    2 --
 drivers/staging/rtl8188eu/include/rtw_recv.h |    1 -
 2 files changed, 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -2
index da26fa5c..a065a7f 100644
@@ -101,8 +101,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 	}
 	precvpriv->rx_pending_cnt = 1;
 
-	sema_init(&precvpriv->allrxreturnevt, 0);
-
 	res = rtw_hal_init_recv_priv(padapter);
 
 	_init_timer(&precvpriv->signal_stat_timer, padapter->pnetdev, RTW_TIMER_HDL_NAME(signal_stat), padapter);
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
index 971dd16..5b3bf29 100644
@@ -193,7 +193,6 @@ struct recv_priv {
 	uint  rx_largepacket_crcerr;
 	uint  rx_smallpacket_crcerr;
 	uint  rx_middlepacket_crcerr;
-	struct semaphore allrxreturnevt;
 	uint	ff_hwaddr;
 	u8	rx_pending_cnt;
 
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/13 staging: rtl8188eu: Remove unused member variables of struct recv_priv

In reply to a message not in the archive

From: navin patidar <[email protected]>

---
 drivers/staging/rtl8188eu/include/rtw_recv.h |    6 ------
 1 file changed, 6 deletions(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -6
index 5b3bf29..d52cfe8 100644
@@ -189,10 +189,6 @@ struct recv_priv {
 	u64	rx_drop;
 	u64	last_rx_bytes;
 
-	uint  rx_icv_err;
-	uint  rx_largepacket_crcerr;
-	uint  rx_smallpacket_crcerr;
-	uint  rx_middlepacket_crcerr;
 	uint	ff_hwaddr;
 	u8	rx_pending_cnt;
 
@@ -212,9 +208,7 @@ struct recv_priv {
 	u8 signal_strength;
 	u8 signal_qual;
 	u8 noise;
-	int RxSNRdB[2];
 	s8 RxRssi[2];
-	int FalseAlmCnt_all;
 
 	struct timer_list signal_stat_timer;
 	u32 signal_stat_sampling_interval;
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/13 staging: rtl8188eu: Remove 'spinlock_t lock' from struct recv_priv

In reply to a message not in the archive

From: navin patidar <[email protected]>

Remove unused variable 'spinlock_t lock'.

---
 drivers/staging/rtl8188eu/core/rtw_recv.c    |    2 --
 drivers/staging/rtl8188eu/include/rtw_recv.h |    1 -
 2 files changed, 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -2
index a065a7f..5260fe5 100644
@@ -63,8 +63,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 
 	int	res = _SUCCESS;
 
-	spin_lock_init(&precvpriv->lock);
-
 	_rtw_init_queue(&precvpriv->free_recv_queue);
 	_rtw_init_queue(&precvpriv->recv_pending_queue);
 	_rtw_init_queue(&precvpriv->uc_swdec_pending_queue);
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
index d52cfe8..68c2ad5f 100644
@@ -175,7 +175,6 @@ recv_thread(passive) ; returnpkt(dispatch)
 using enter_critical section to protect
 */
 struct recv_priv {
-	spinlock_t lock;
 	struct __queue free_recv_queue;
 	struct __queue recv_pending_queue;
 	struct __queue uc_swdec_pending_queue;
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 4/13 staging: rtl8188eu: Remove struct zero_bulkout_context

In reply to a message not in the archive

From: navin patidar <[email protected]>

Remove unused struct zero_bulkout_context.

---
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c |    7 -------
 1 file changed, 7 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +0 -7
index fb0bba8..ba2a8ab 100644
@@ -39,13 +39,6 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)
 	return pipe;
 }
 
-struct zero_bulkout_context {
-	void *pbuf;
-	void *purb;
-	void *pirp;
-	void *padapter;
-};
-
 void usb_read_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
 {
 }
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 5/13 staging: rtl8188eu: Remove function rtw_os_recv_resource_init()

In reply to a message not in the archive

From: navin patidar <[email protected]>

rtw_os_recv_resource_init() has empty defination, so we can remove it.

---
 drivers/staging/rtl8188eu/core/rtw_recv.c      |    2 --
 drivers/staging/rtl8188eu/include/recv_osdep.h |    1 -
 drivers/staging/rtl8188eu/os_dep/recv_linux.c  |    7 -------
 3 files changed, 10 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -2
index 5260fe5..56b1ef1 100644
@@ -71,8 +71,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 
 	precvpriv->free_recvframe_cnt = NR_RECVFRAME;
 
-	rtw_os_recv_resource_init(precvpriv, padapter);
-
 	precvpriv->pallocated_frame_buf = vzalloc(NR_RECVFRAME * sizeof(struct recv_frame) + RXFRAME_ALIGN_SZ);
 
 	if (precvpriv->pallocated_frame_buf == NULL) {
drivers/staging/rtl8188eu/include/recv_osdep.h +0 -1
index d76cc2d..f49ac56 100644
@@ -39,7 +39,6 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup);
 int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
 void rtw_free_recv_priv(struct recv_priv *precvpriv);
 
-int rtw_os_recv_resource_init(struct recv_priv *recvpr, struct adapter *adapt);
 int rtw_os_recv_resource_alloc(struct adapter *adapt,
 			       struct recv_frame *recvfr);
 void rtw_os_recv_resource_free(struct recv_priv *precvpriv);
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -7
index 29ec014..c1fbe8d 100644
@@ -28,13 +28,6 @@
 #include <osdep_intf.h>
 #include <usb_ops.h>
 
-/* init os related resource in struct recv_priv */
-int rtw_os_recv_resource_init(struct recv_priv *precvpriv,
-			      struct adapter *padapter)
-{
-	return _SUCCESS;
-}
-
 /* alloc os related resource in struct recv_frame */
 int rtw_os_recv_resource_alloc(struct adapter *padapter,
 			       struct recv_frame *precvframe)
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 6/13 staging: rtl8188eu: Remove function rtw_os_recv_resource_free()

In reply to a message not in the archive

From: navin patidar <[email protected]>

rtw_os_recv_resource_free() has empty defination, so we can remove it.

---
 drivers/staging/rtl8188eu/core/rtw_recv.c      |    2 --
 drivers/staging/rtl8188eu/include/recv_osdep.h |    1 -
 drivers/staging/rtl8188eu/os_dep/recv_linux.c  |    5 -----
 3 files changed, 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -2
index 56b1ef1..db6ab4f 100644
@@ -117,8 +117,6 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
 
 	rtw_free_uc_swdec_pending_queue(padapter);
 
-	rtw_os_recv_resource_free(precvpriv);
-
 	if (precvpriv->pallocated_frame_buf) {
 		vfree(precvpriv->pallocated_frame_buf);
 	}
drivers/staging/rtl8188eu/include/recv_osdep.h +0 -1
index f49ac56..44caea9 100644
@@ -41,7 +41,6 @@ void rtw_free_recv_priv(struct recv_priv *precvpriv);
 
 int rtw_os_recv_resource_alloc(struct adapter *adapt,
 			       struct recv_frame *recvfr);
-void rtw_os_recv_resource_free(struct recv_priv *precvpriv);
 
 int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *buf);
 int rtw_os_recvbuf_resource_free(struct adapter *adapt, struct recv_buf *buf);
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -5
index c1fbe8d..d1ce639 100644
@@ -37,11 +37,6 @@ int rtw_os_recv_resource_alloc(struct adapter *padapter,
 	return _SUCCESS;
 }
 
-/* free os related resource in struct recv_frame */
-void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
-{
-}
-
 /* alloc os related resource in struct recv_buf */
 int rtw_os_recvbuf_resource_alloc(struct adapter *padapter,
 				  struct recv_buf *precvbuf)
Signature · 1 line
1.7.10.4
#7 lore raw

PATCH 7/13 staging: rtl8188eu: Remove function rtw_hostapd_mlme_rx()

In reply to a message not in the archive

From: navin patidar <[email protected]>

rtw_hostapd_mlme_rx() has empty defination, so we can remove it.

---
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c  |    2 --
 drivers/staging/rtl8188eu/include/recv_osdep.h |    1 -
 drivers/staging/rtl8188eu/os_dep/recv_linux.c  |    5 -----
 3 files changed, 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -2
index 55be52f..e854732 100644
@@ -502,8 +502,6 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
 		break;
 	default:
 		_mgt_dispatcher(padapter, ptable, precv_frame);
-		if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
-			rtw_hostapd_mlme_rx(padapter, precv_frame);
 		break;
 	}
 #else
drivers/staging/rtl8188eu/include/recv_osdep.h +0 -1
index 44caea9..5333598 100644
@@ -33,7 +33,6 @@ int rtw_recv_indicatepkt(struct adapter *adapter,
 			 struct recv_frame *recv_frame);
 void rtw_recv_returnpacket(struct  net_device *cnxt, struct sk_buff *retpkt);
 
-void rtw_hostapd_mlme_rx(struct adapter *padapter, struct recv_frame *recv_fr);
 void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup);
 
 int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -5
index d1ce639..edb7969 100644
@@ -95,11 +95,6 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)
 			    &wrqu, (char *)&ev);
 }
 
-void rtw_hostapd_mlme_rx(struct adapter *padapter,
-			 struct recv_frame *precv_frame)
-{
-}
-
 int rtw_recv_indicatepkt(struct adapter *padapter,
 			 struct recv_frame *precv_frame)
 {
Signature · 1 line
1.7.10.4
#8 lore raw

PATCH 8/13 staging: rtl8188eu: Remove function rtw_os_recvbuf_resource_free()

In reply to a message not in the archive

From: navin patidar <[email protected]>

Use usb_free_urb() instead of rtw_os_recvbuf_resource_free() to free URB.

---
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c |    2 +-
 drivers/staging/rtl8188eu/include/recv_osdep.h |    1 -
 drivers/staging/rtl8188eu/os_dep/recv_linux.c  |    8 --------
 3 files changed, 1 insertion(+), 10 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +1 -1
index 2b45564..0f6222d 100644
@@ -97,7 +97,7 @@ void rtl8188eu_free_recv_priv(struct adapter *padapter)
 	precvbuf = (struct recv_buf *)precvpriv->precv_buf;
 
 	for (i = 0; i < NR_RECVBUFF; i++) {
-		rtw_os_recvbuf_resource_free(padapter, precvbuf);
+		usb_free_urb(precvbuf->purb);
 		precvbuf++;
 	}
 
drivers/staging/rtl8188eu/include/recv_osdep.h +0 -1
index 5333598..a4fd957 100644
@@ -42,7 +42,6 @@ int rtw_os_recv_resource_alloc(struct adapter *adapt,
 			       struct recv_frame *recvfr);
 
 int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *buf);
-int rtw_os_recvbuf_resource_free(struct adapter *adapt, struct recv_buf *buf);
 
 void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf);
 
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -8
index edb7969..c0fa8fd 100644
@@ -51,14 +51,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter,
 	return res;
 }
 
-/* free os related resource in struct recv_buf */
-int rtw_os_recvbuf_resource_free(struct adapter *padapter,
-				 struct recv_buf *precvbuf)
-{
-	usb_free_urb(precvbuf->purb);
-	return _SUCCESS;
-}
-
 void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)
 {
 	union iwreq_data wrqu;
Signature · 1 line
1.7.10.4