All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/4] Cleanups for rtl871x_ioctl_rtl
@ 2015-11-25 17:42 Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Mauro Dreissig @ 2015-11-25 17:42 UTC (permalink / raw)
  To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig

This applies some janitorial work to rtl8712 driver.

Mauro Dreissig (4):
  staging: rtl8712: Remove casts between void * and type *
  staging: rtl8712: Rename local variable
  staging: rtl8712: Make error handling check for failure
  staging: rtl8712: Rename local variable

 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 492 +++++++++++++---------------
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 123 +++----
 2 files changed, 274 insertions(+), 341 deletions(-)

-- 
2.6.3

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v2 1/4] staging: rtl8712: Remove casts between void * and type *
  2015-11-25 17:42 [PATCH v2 0/4] Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
@ 2015-11-25 17:42 ` Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Mauro Dreissig @ 2015-11-25 17:42 UTC (permalink / raw)
  To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig

This removes unnecessary explicit pointer casts in rtl871x_ioctl_rtl.c.

Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 45 ++++++++++-------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 7c346a4..c7f2e51 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -49,8 +49,7 @@ uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -66,8 +65,7 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -83,8 +81,7 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -115,8 +112,7 @@ uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -147,8 +143,7 @@ uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -172,8 +167,7 @@ uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv
 
 uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 	u32 preamblemode = 0;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
@@ -202,8 +196,7 @@ uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 	struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
@@ -216,8 +209,7 @@ uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
 uint oid_rt_set_channelplan_hdl(struct oid_par_priv
 				       *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 	struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
 
 	if (poid_par_priv->type_of_oid != SET_OID)
@@ -229,8 +221,7 @@ uint oid_rt_set_channelplan_hdl(struct oid_par_priv
 uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
 					 *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 	u32 preamblemode = 0;
 
 	if (poid_par_priv->type_of_oid != SET_OID)
@@ -267,8 +258,7 @@ uint oid_rt_dedicate_probe_hdl(struct oid_par_priv
 uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
 					  *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -285,8 +275,7 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
 uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
 					  *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -325,8 +314,7 @@ uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv
 
 uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				    (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	struct NDIS_802_11_CONFIGURATION *pnic_Config;
 	u32   channelnum;
@@ -449,8 +437,7 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
 					     poid_par_priv)
 {
 	uint status = RNDIS_STATUS_SUCCESS;
-	struct _adapter *Adapter = (struct _adapter *)
-			(poid_par_priv->adapter_context);
+	struct _adapter *Adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -470,8 +457,7 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
 uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 {
 	uint status = RNDIS_STATUS_SUCCESS;
-	struct _adapter *Adapter = (struct _adapter *)
-			(poid_par_priv->adapter_context);
+	struct _adapter *Adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -516,8 +502,7 @@ enum _CONNECT_STATE_ {
 
 uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = (struct _adapter *)
-				     (poid_par_priv->adapter_context);
+	struct _adapter *padapter = poid_par_priv->adapter_context;
 	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 	u32 ulInfo;
 
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v2 2/4] staging: rtl8712: Rename local variable
  2015-11-25 17:42 [PATCH v2 0/4] Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
@ 2015-11-25 17:42 ` Mauro Dreissig
  2016-02-08  3:51   ` Greg KH
  2015-11-25 17:42 ` [PATCH v2 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 4/4] staging: rtl8712: Rename local variable Mauro Dreissig
  3 siblings, 1 reply; 6+ messages in thread
From: Mauro Dreissig @ 2015-11-25 17:42 UTC (permalink / raw)
  To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig

Renames all instances of struct _adapter to adapter in rtl871x_ioctl_rtl.c,
avoiding camel case.

Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 86 ++++++++++++++---------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index c7f2e51..97596aa 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -49,13 +49,13 @@ uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
 		*(u32 *)poid_par_priv->information_buf =
-				padapter->recvpriv.rx_smallpacket_crcerr;
+				adapter->recvpriv.rx_smallpacket_crcerr;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
 		return RNDIS_STATUS_INVALID_LENGTH;
@@ -65,13 +65,13 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
 		*(u32 *)poid_par_priv->information_buf =
-				padapter->recvpriv.rx_middlepacket_crcerr;
+				adapter->recvpriv.rx_middlepacket_crcerr;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
 		return RNDIS_STATUS_INVALID_LENGTH;
@@ -81,13 +81,13 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
 		*(u32 *)poid_par_priv->information_buf =
-				 padapter->recvpriv.rx_largepacket_crcerr;
+				 adapter->recvpriv.rx_largepacket_crcerr;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
 		return RNDIS_STATUS_INVALID_LENGTH;
@@ -112,14 +112,14 @@ uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
 		*(u32 *)poid_par_priv->information_buf =
-					 padapter->recvpriv.rx_pkts +
-					 padapter->recvpriv.rx_drop;
+					 adapter->recvpriv.rx_pkts +
+					 adapter->recvpriv.rx_drop;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
 		return RNDIS_STATUS_INVALID_LENGTH;
@@ -143,13 +143,13 @@ uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
 		*(uint *)poid_par_priv->information_buf =
-					 padapter->recvpriv.rx_icv_err;
+					 adapter->recvpriv.rx_icv_err;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
 		return RNDIS_STATUS_INVALID_LENGTH;
@@ -167,17 +167,17 @@ uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv
 
 uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 	u32 preamblemode = 0;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		if (padapter->registrypriv.preamble == PREAMBLE_LONG)
+		if (adapter->registrypriv.preamble == PREAMBLE_LONG)
 			preamblemode = 0;
-		else if (padapter->registrypriv.preamble == PREAMBLE_AUTO)
+		else if (adapter->registrypriv.preamble == PREAMBLE_AUTO)
 			preamblemode = 1;
-		else if (padapter->registrypriv.preamble == PREAMBLE_SHORT)
+		else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
 			preamblemode = 2;
 		*(u32 *)poid_par_priv->information_buf = preamblemode;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
@@ -196,8 +196,8 @@ uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *poid_par_priv)
 
 uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
-	struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -209,8 +209,8 @@ uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
 uint oid_rt_set_channelplan_hdl(struct oid_par_priv
 				       *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
-	struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
 
 	if (poid_par_priv->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
@@ -221,7 +221,7 @@ uint oid_rt_set_channelplan_hdl(struct oid_par_priv
 uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
 					 *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 	u32 preamblemode = 0;
 
 	if (poid_par_priv->type_of_oid != SET_OID)
@@ -229,11 +229,11 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
 	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
 		preamblemode = *(u32 *)poid_par_priv->information_buf;
 		if (preamblemode == 0)
-			padapter->registrypriv.preamble = PREAMBLE_LONG;
+			adapter->registrypriv.preamble = PREAMBLE_LONG;
 		else if (preamblemode == 1)
-			padapter->registrypriv.preamble = PREAMBLE_AUTO;
+			adapter->registrypriv.preamble = PREAMBLE_AUTO;
 		else if (preamblemode == 2)
-			padapter->registrypriv.preamble = PREAMBLE_SHORT;
+			adapter->registrypriv.preamble = PREAMBLE_SHORT;
 		*(u32 *)poid_par_priv->information_buf = preamblemode;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
@@ -258,13 +258,13 @@ uint oid_rt_dedicate_probe_hdl(struct oid_par_priv
 uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
 					  *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
 		*(u32 *)poid_par_priv->information_buf =
-						 padapter->xmitpriv.tx_bytes;
+						 adapter->xmitpriv.tx_bytes;
 		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	} else {
 		return RNDIS_STATUS_INVALID_LENGTH;
@@ -275,13 +275,13 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
 uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
 					  *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
 		*(u32 *)poid_par_priv->information_buf =
-					   padapter->recvpriv.rx_bytes;
+					   adapter->recvpriv.rx_bytes;
 		*poid_par_priv->bytes_rw = poid_par_priv->
 					   information_buf_len;
 	} else {
@@ -314,8 +314,8 @@ uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv
 
 uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
-	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct	mlme_priv *pmlmepriv = &adapter->mlmepriv;
 	struct NDIS_802_11_CONFIGURATION *pnic_Config;
 	u32   channelnum;
 
@@ -325,7 +325,7 @@ uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
 	    check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
 		pnic_Config = &pmlmepriv->cur_network.network.Configuration;
 	else
-		pnic_Config = &padapter->registrypriv.dev_network.
+		pnic_Config = &adapter->registrypriv.dev_network.
 			      Configuration;
 	channelnum = pnic_Config->DSConfig;
 	*(u32 *)poid_par_priv->information_buf = channelnum;
@@ -437,13 +437,13 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
 					     poid_par_priv)
 {
 	uint status = RNDIS_STATUS_SUCCESS;
-	struct _adapter *Adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len ==
 	   (sizeof(unsigned long) * 3)) {
-		if (!r8712_setrfreg_cmd(Adapter,
+		if (!r8712_setrfreg_cmd(adapter,
 			*(unsigned char *)poid_par_priv->information_buf,
 			(unsigned long)(*((unsigned long *)
 					poid_par_priv->information_buf + 2))))
@@ -457,22 +457,22 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
 uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 {
 	uint status = RNDIS_STATUS_SUCCESS;
-	struct _adapter *Adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (poid_par_priv->information_buf_len == (sizeof(unsigned long) *
 						   3)) {
-		if (Adapter->mppriv.act_in_progress) {
+		if (adapter->mppriv.act_in_progress) {
 			status = RNDIS_STATUS_NOT_ACCEPTED;
 		} else {
 			/* init workparam */
-			Adapter->mppriv.act_in_progress = true;
-			Adapter->mppriv.workparam.bcompleted = false;
-			Adapter->mppriv.workparam.act_type = MPT_READ_RF;
-			Adapter->mppriv.workparam.io_offset = *(unsigned long *)
+			adapter->mppriv.act_in_progress = true;
+			adapter->mppriv.workparam.bcompleted = false;
+			adapter->mppriv.workparam.act_type = MPT_READ_RF;
+			adapter->mppriv.workparam.io_offset = *(unsigned long *)
 						poid_par_priv->information_buf;
-			Adapter->mppriv.workparam.io_value = 0xcccccccc;
+			adapter->mppriv.workparam.io_value = 0xcccccccc;
 
 		/* RegOffsetValue	- The offset of RF register to read.
 		 * RegDataWidth	- The data width of RF register to read.
@@ -481,9 +481,9 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 		 * RegDataWidth = *((unsigned long *)InformationBuffer+1);
 		 * RegDataValue =  *((unsigned long *)InformationBuffer+2);
 		 */
-			if (!r8712_getrfreg_cmd(Adapter,
+			if (!r8712_getrfreg_cmd(adapter,
 			    *(unsigned char *)poid_par_priv->information_buf,
-			    (unsigned char *)&Adapter->mppriv.workparam.
+			    (unsigned char *)&adapter->mppriv.workparam.
 			    io_value))
 				status = RNDIS_STATUS_NOT_ACCEPTED;
 		}
@@ -502,8 +502,8 @@ enum _CONNECT_STATE_ {
 
 uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
 {
-	struct _adapter *padapter = poid_par_priv->adapter_context;
-	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
 	u32 ulInfo;
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v2 3/4] staging: rtl8712: Make error handling check for failure
  2015-11-25 17:42 [PATCH v2 0/4] Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
@ 2015-11-25 17:42 ` Mauro Dreissig
  2015-11-25 17:42 ` [PATCH v2 4/4] staging: rtl8712: Rename local variable Mauro Dreissig
  3 siblings, 0 replies; 6+ messages in thread
From: Mauro Dreissig @ 2015-11-25 17:42 UTC (permalink / raw)
  To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig

Make all error handling paths check for failure instead of success
in rtl871x_ioctl_rtl.c, reducing indentation and avoiding else
statements.

Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 239 +++++++++++++++-------------
 1 file changed, 124 insertions(+), 115 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 97596aa..3f1fa12 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -53,13 +53,14 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
-		*(u32 *)poid_par_priv->information_buf =
-				adapter->recvpriv.rx_smallpacket_crcerr;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(u32 *)poid_par_priv->information_buf =
+		adapter->recvpriv.rx_smallpacket_crcerr;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -69,13 +70,14 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
-		*(u32 *)poid_par_priv->information_buf =
-				adapter->recvpriv.rx_middlepacket_crcerr;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(u32 *)poid_par_priv->information_buf =
+		adapter->recvpriv.rx_middlepacket_crcerr;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -85,13 +87,14 @@ uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
-		*(u32 *)poid_par_priv->information_buf =
-				 adapter->recvpriv.rx_largepacket_crcerr;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(u32 *)poid_par_priv->information_buf =
+		adapter->recvpriv.rx_largepacket_crcerr;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -116,14 +119,14 @@ uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >=  sizeof(u32)) {
-		*(u32 *)poid_par_priv->information_buf =
-					 adapter->recvpriv.rx_pkts +
-					 adapter->recvpriv.rx_drop;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(u32 *)poid_par_priv->information_buf =
+			adapter->recvpriv.rx_pkts + adapter->recvpriv.rx_drop;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -147,13 +150,13 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		*(uint *)poid_par_priv->information_buf =
-					 adapter->recvpriv.rx_icv_err;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(uint *)poid_par_priv->information_buf = adapter->recvpriv.rx_icv_err;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -172,18 +175,20 @@ uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		if (adapter->registrypriv.preamble == PREAMBLE_LONG)
-			preamblemode = 0;
-		else if (adapter->registrypriv.preamble == PREAMBLE_AUTO)
-			preamblemode = 1;
-		else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
-			preamblemode = 2;
-		*(u32 *)poid_par_priv->information_buf = preamblemode;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	if (adapter->registrypriv.preamble == PREAMBLE_LONG)
+		preamblemode = 0;
+	else if (adapter->registrypriv.preamble == PREAMBLE_AUTO)
+		preamblemode = 1;
+	else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
+		preamblemode = 2;
+
+	*(u32 *)poid_par_priv->information_buf = preamblemode;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -201,8 +206,10 @@ uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
+
 	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
 	*(u16 *)poid_par_priv->information_buf = peeprompriv->channel_plan;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -214,7 +221,9 @@ uint oid_rt_set_channelplan_hdl(struct oid_par_priv
 
 	if (poid_par_priv->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
+
 	peeprompriv->channel_plan = *(u16 *)poid_par_priv->information_buf;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -226,19 +235,21 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
 
 	if (poid_par_priv->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		preamblemode = *(u32 *)poid_par_priv->information_buf;
-		if (preamblemode == 0)
-			adapter->registrypriv.preamble = PREAMBLE_LONG;
-		else if (preamblemode == 1)
-			adapter->registrypriv.preamble = PREAMBLE_AUTO;
-		else if (preamblemode == 2)
-			adapter->registrypriv.preamble = PREAMBLE_SHORT;
-		*(u32 *)poid_par_priv->information_buf = preamblemode;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	preamblemode = *(u32 *)poid_par_priv->information_buf;
+	if (preamblemode == 0)
+		adapter->registrypriv.preamble = PREAMBLE_LONG;
+	else if (preamblemode == 1)
+		adapter->registrypriv.preamble = PREAMBLE_AUTO;
+	else if (preamblemode == 2)
+		adapter->registrypriv.preamble = PREAMBLE_SHORT;
+
+	*(u32 *)poid_par_priv->information_buf = preamblemode;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -262,13 +273,13 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		*(u32 *)poid_par_priv->information_buf =
-						 adapter->xmitpriv.tx_bytes;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(u32 *)poid_par_priv->information_buf = adapter->xmitpriv.tx_bytes;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -279,14 +290,13 @@ uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		*(u32 *)poid_par_priv->information_buf =
-					   adapter->recvpriv.rx_bytes;
-		*poid_par_priv->bytes_rw = poid_par_priv->
-					   information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	*(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_bytes;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -355,15 +365,16 @@ uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv
 
 	if (poid_par_priv->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len >= sizeof(u32)) {
-		ulInfo |= 0x0100; /* WIRELESS_MODE_B */
-		ulInfo |= 0x0200; /* WIRELESS_MODE_G */
-		ulInfo |= 0x0400; /* WIRELESS_MODE_A */
-		*(u32 *) poid_par_priv->information_buf = ulInfo;
-		*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	} else {
+
+	if (poid_par_priv->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
-	}
+
+	ulInfo |= 0x0100; /* WIRELESS_MODE_B */
+	ulInfo |= 0x0200; /* WIRELESS_MODE_G */
+	ulInfo |= 0x0400; /* WIRELESS_MODE_A */
+	*(u32 *)poid_par_priv->information_buf = ulInfo;
+	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
@@ -436,61 +447,57 @@ uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *poid_par_priv)
 uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
 					     poid_par_priv)
 {
-	uint status = RNDIS_STATUS_SUCCESS;
 	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len ==
-	   (sizeof(unsigned long) * 3)) {
-		if (!r8712_setrfreg_cmd(adapter,
+
+	if (poid_par_priv->information_buf_len != sizeof(unsigned long) * 3)
+		return RNDIS_STATUS_INVALID_LENGTH;
+
+	if (!r8712_setrfreg_cmd(adapter,
 			*(unsigned char *)poid_par_priv->information_buf,
 			(unsigned long)(*((unsigned long *)
 					poid_par_priv->information_buf + 2))))
-			status = RNDIS_STATUS_NOT_ACCEPTED;
-	} else {
-		status = RNDIS_STATUS_INVALID_LENGTH;
-	}
-	return status;
+		return RNDIS_STATUS_NOT_ACCEPTED;
+
+	return RNDIS_STATUS_SUCCESS;
 }
 
 uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 {
-	uint status = RNDIS_STATUS_SUCCESS;
 	struct _adapter *adapter = poid_par_priv->adapter_context;
 
 	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	if (poid_par_priv->information_buf_len == (sizeof(unsigned long) *
-						   3)) {
-		if (adapter->mppriv.act_in_progress) {
-			status = RNDIS_STATUS_NOT_ACCEPTED;
-		} else {
-			/* init workparam */
-			adapter->mppriv.act_in_progress = true;
-			adapter->mppriv.workparam.bcompleted = false;
-			adapter->mppriv.workparam.act_type = MPT_READ_RF;
-			adapter->mppriv.workparam.io_offset = *(unsigned long *)
-						poid_par_priv->information_buf;
-			adapter->mppriv.workparam.io_value = 0xcccccccc;
-
-		/* RegOffsetValue	- The offset of RF register to read.
-		 * RegDataWidth	- The data width of RF register to read.
-		 * RegDataValue	- The value to read.
-		 * RegOffsetValue = *((unsigned long *)InformationBuffer);
-		 * RegDataWidth = *((unsigned long *)InformationBuffer+1);
-		 * RegDataValue =  *((unsigned long *)InformationBuffer+2);
-		 */
-			if (!r8712_getrfreg_cmd(adapter,
-			    *(unsigned char *)poid_par_priv->information_buf,
-			    (unsigned char *)&adapter->mppriv.workparam.
-			    io_value))
-				status = RNDIS_STATUS_NOT_ACCEPTED;
-		}
-	} else {
-		status = RNDIS_STATUS_INVALID_LENGTH;
-	}
-	return status;
+
+	if (poid_par_priv->information_buf_len != sizeof(unsigned long) * 3)
+		return RNDIS_STATUS_INVALID_LENGTH;
+
+	if (adapter->mppriv.act_in_progress)
+		return RNDIS_STATUS_NOT_ACCEPTED;
+
+	/* init workparam */
+	adapter->mppriv.act_in_progress = true;
+	adapter->mppriv.workparam.bcompleted = false;
+	adapter->mppriv.workparam.act_type = MPT_READ_RF;
+	adapter->mppriv.workparam.io_offset = *(unsigned long *)
+				poid_par_priv->information_buf;
+	adapter->mppriv.workparam.io_value = 0xcccccccc;
+
+	/* RegOffsetValue	- The offset of RF register to read.
+	 * RegDataWidth	- The data width of RF register to read.
+	 * RegDataValue	- The value to read.
+	 * RegOffsetValue = *((unsigned long *)InformationBuffer);
+	 * RegDataWidth = *((unsigned long *)InformationBuffer+1);
+	 * RegDataValue =  *((unsigned long *)InformationBuffer+2);
+	 */
+	if (!r8712_getrfreg_cmd(adapter,
+			*(unsigned char *)poid_par_priv->information_buf,
+			(unsigned char *)&adapter->mppriv.workparam.io_value))
+		return RNDIS_STATUS_NOT_ACCEPTED;
+
+	return RNDIS_STATUS_SUCCESS;
 }
 
 enum _CONNECT_STATE_ {
@@ -521,8 +528,10 @@ uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
 		ulInfo = ADHOCMODE;
 	else
 		ulInfo = NOTASSOCIATED;
+
 	*(u32 *)poid_par_priv->information_buf = ulInfo;
 	*poid_par_priv->bytes_rw =  poid_par_priv->information_buf_len;
+
 	return RNDIS_STATUS_SUCCESS;
 }
 
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v2 4/4] staging: rtl8712: Rename local variable
  2015-11-25 17:42 [PATCH v2 0/4] Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
                   ` (2 preceding siblings ...)
  2015-11-25 17:42 ` [PATCH v2 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
@ 2015-11-25 17:42 ` Mauro Dreissig
  3 siblings, 0 replies; 6+ messages in thread
From: Mauro Dreissig @ 2015-11-25 17:42 UTC (permalink / raw)
  To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev

Renames all instances of struct oid_par_priv to oid in rtl871x_ioctl_rtl.c
and rtl871x_ioctl_rtl.h, making the code cleaner.

Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 292 +++++++++++++---------------
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 123 ++++--------
 2 files changed, 177 insertions(+), 238 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 3f1fa12..290e650 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -40,143 +40,139 @@
 #include "rtl871x_mp.h"
 #include "rtl871x_mp_ioctl.h"
 
-uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(u32 *)poid_par_priv->information_buf =
-		adapter->recvpriv.rx_smallpacket_crcerr;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = adapter->recvpriv.rx_smallpacket_crcerr;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(u32 *)poid_par_priv->information_buf =
-		adapter->recvpriv.rx_middlepacket_crcerr;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = adapter->recvpriv.rx_middlepacket_crcerr;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(u32 *)poid_par_priv->information_buf =
-		adapter->recvpriv.rx_largepacket_crcerr;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = adapter->recvpriv.rx_largepacket_crcerr;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_tx_retry_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_tx_retry_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*oid->bytes_rw = oid->information_buf_len;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(u32 *)poid_par_priv->information_buf =
-			adapter->recvpriv.rx_pkts + adapter->recvpriv.rx_drop;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = adapter->recvpriv.rx_pkts +
+		adapter->recvpriv.rx_drop;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(uint *)poid_par_priv->information_buf = adapter->recvpriv.rx_icv_err;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(uint *)oid->information_buf = adapter->recvpriv.rx_icv_err;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv
-						*poid_par_priv)
+uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != SET_OID)
+	if (oid->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 	u32 preamblemode = 0;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
 	if (adapter->registrypriv.preamble == PREAMBLE_LONG)
@@ -186,60 +182,58 @@ uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
 	else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
 		preamblemode = 2;
 
-	*(u32 *)poid_par_priv->information_buf = preamblemode;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = preamblemode;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_channelplan_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 	struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-	*(u16 *)poid_par_priv->information_buf = peeprompriv->channel_plan;
+	*oid->bytes_rw = oid->information_buf_len;
+	*(u16 *)oid->information_buf = peeprompriv->channel_plan;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_set_channelplan_hdl(struct oid_par_priv
-				       *poid_par_priv)
+uint oid_rt_set_channelplan_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 	struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
 
-	if (poid_par_priv->type_of_oid != SET_OID)
+	if (oid->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	peeprompriv->channel_plan = *(u16 *)poid_par_priv->information_buf;
+	peeprompriv->channel_plan = *(u16 *)oid->information_buf;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
-					 *poid_par_priv)
+uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 	u32 preamblemode = 0;
 
-	if (poid_par_priv->type_of_oid != SET_OID)
+	if (oid->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	preamblemode = *(u32 *)poid_par_priv->information_buf;
+	preamblemode = *(u32 *)oid->information_buf;
 	if (preamblemode == 0)
 		adapter->registrypriv.preamble = PREAMBLE_LONG;
 	else if (preamblemode == 1)
@@ -247,89 +241,83 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
 	else if (preamblemode == 2)
 		adapter->registrypriv.preamble = PREAMBLE_SHORT;
 
-	*(u32 *)poid_par_priv->information_buf = preamblemode;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = preamblemode;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_set_bcn_intvl_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_set_bcn_intvl_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != SET_OID)
+	if (oid->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_dedicate_probe_hdl(struct oid_par_priv
-				      *poid_par_priv)
+uint oid_rt_dedicate_probe_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
-					  *poid_par_priv)
+uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(u32 *)poid_par_priv->information_buf = adapter->xmitpriv.tx_bytes;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = adapter->xmitpriv.tx_bytes;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
-					  *poid_par_priv)
+uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
-	*(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_bytes;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = adapter->recvpriv.rx_bytes;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_current_tx_power_level_hdl(struct oid_par_priv
-					      *poid_par_priv)
+uint oid_rt_current_tx_power_level_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv
-						  *poid_par_priv)
+uint oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv
-					       *poid_par_priv)
+uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_channel_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 	struct	mlme_priv *pmlmepriv = &adapter->mlmepriv;
 	struct NDIS_802_11_CONFIGURATION *pnic_Config;
 	u32   channelnum;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	if (check_fwstate(pmlmepriv, _FW_LINKED) ||
 	    check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
@@ -338,140 +326,132 @@ uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
 		pnic_Config = &adapter->registrypriv.dev_network.
 			      Configuration;
 	channelnum = pnic_Config->DSConfig;
-	*(u32 *)poid_par_priv->information_buf = channelnum;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = channelnum;
+	*oid->bytes_rw = oid->information_buf_len;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv
-			 *poid_par_priv)
+uint oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_key_mismatch_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_key_mismatch_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv
-					       *poid_par_priv)
+uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv *oid)
 {
 	u32 ulInfo = 0;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len < sizeof(u32))
+	if (oid->information_buf_len < sizeof(u32))
 		return RNDIS_STATUS_INVALID_LENGTH;
 
 	ulInfo |= 0x0100; /* WIRELESS_MODE_B */
 	ulInfo |= 0x0200; /* WIRELESS_MODE_G */
 	ulInfo |= 0x0400; /* WIRELESS_MODE_A */
-	*(u32 *)poid_par_priv->information_buf = ulInfo;
-	*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = ulInfo;
+	*oid->bytes_rw = oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_channel_list_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_channel_list_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_scan_in_progress_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_scan_in_progress_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
 
-uint oid_rt_forced_data_rate_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_forced_data_rate_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv
-						   *poid_par_priv)
+uint oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv
-					     *poid_par_priv)
+uint oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv
-					      *poid_par_priv)
+uint oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv
-						      *poid_par_priv)
+uint oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv*
-					      poid_par_priv)
+uint oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_ap_supported_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_ap_supported_hdl(struct oid_par_priv *oid)
 {
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != SET_OID)
+	if (oid->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
-					     poid_par_priv)
+uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
+	if (oid->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len != sizeof(unsigned long) * 3)
+	if (oid->information_buf_len != sizeof(unsigned long) * 3)
 		return RNDIS_STATUS_INVALID_LENGTH;
 
 	if (!r8712_setrfreg_cmd(adapter,
-			*(unsigned char *)poid_par_priv->information_buf,
+			*(unsigned char *)oid->information_buf,
 			(unsigned long)(*((unsigned long *)
-					poid_par_priv->information_buf + 2))))
+					oid->information_buf + 2))))
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 
-	if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
+	if (oid->type_of_oid != SET_OID) /* QUERY_OID */
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
-	if (poid_par_priv->information_buf_len != sizeof(unsigned long) * 3)
+	if (oid->information_buf_len != sizeof(unsigned long) * 3)
 		return RNDIS_STATUS_INVALID_LENGTH;
 
 	if (adapter->mppriv.act_in_progress)
@@ -482,7 +462,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 	adapter->mppriv.workparam.bcompleted = false;
 	adapter->mppriv.workparam.act_type = MPT_READ_RF;
 	adapter->mppriv.workparam.io_offset = *(unsigned long *)
-				poid_par_priv->information_buf;
+				oid->information_buf;
 	adapter->mppriv.workparam.io_value = 0xcccccccc;
 
 	/* RegOffsetValue	- The offset of RF register to read.
@@ -493,7 +473,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 	 * RegDataValue =  *((unsigned long *)InformationBuffer+2);
 	 */
 	if (!r8712_getrfreg_cmd(adapter,
-			*(unsigned char *)poid_par_priv->information_buf,
+			*(unsigned char *)oid->information_buf,
 			(unsigned char *)&adapter->mppriv.workparam.io_value))
 		return RNDIS_STATUS_NOT_ACCEPTED;
 
@@ -507,13 +487,13 @@ enum _CONNECT_STATE_ {
 	NOTASSOCIATED
 };
 
-uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_connect_state_hdl(struct oid_par_priv *oid)
 {
-	struct _adapter *adapter = poid_par_priv->adapter_context;
+	struct _adapter *adapter = oid->adapter_context;
 	struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
 	u32 ulInfo;
 
-	if (poid_par_priv->type_of_oid != QUERY_OID)
+	if (oid->type_of_oid != QUERY_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	/* nStatus==0	CheckingStatus
 	 * nStatus==1	Associated
@@ -529,15 +509,15 @@ uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
 	else
 		ulInfo = NOTASSOCIATED;
 
-	*(u32 *)poid_par_priv->information_buf = ulInfo;
-	*poid_par_priv->bytes_rw =  poid_par_priv->information_buf_len;
+	*(u32 *)oid->information_buf = ulInfo;
+	*oid->bytes_rw =  oid->information_buf_len;
 
 	return RNDIS_STATUS_SUCCESS;
 }
 
-uint oid_rt_set_default_key_id_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_set_default_key_id_hdl(struct oid_par_priv *oid)
 {
-	if (poid_par_priv->type_of_oid != SET_OID)
+	if (oid->type_of_oid != SET_OID)
 		return RNDIS_STATUS_NOT_ACCEPTED;
 	return RNDIS_STATUS_SUCCESS;
 }
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h
index 3bcceae..fb2aa0c 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h
@@ -30,92 +30,51 @@
 #include "drv_types.h"
 
 /*************** oid_rtl_seg_01_01 **************/
-uint oid_rt_get_signal_quality_hdl(
-			struct oid_par_priv *poid_par_priv);/*84*/
-uint oid_rt_get_small_packet_crc_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_middle_packet_crc_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_large_packet_crc_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_tx_retry_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_rx_retry_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_rx_total_packet_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_tx_beacon_ok_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_tx_beacon_err_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_rx_icv_err_hdl(
-			struct oid_par_priv *poid_par_priv);/*93*/
-uint oid_rt_set_encryption_algorithm_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_preamble_mode_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_ap_ip_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_channelplan_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_channelplan_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_preamble_mode_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_bcn_intvl_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_dedicate_probe_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_total_tx_bytes_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_total_rx_bytes_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_current_tx_power_level_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_enc_key_mismatch_count_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_enc_key_match_count_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_channel_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_hardware_radio_off_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_key_mismatch_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_supported_wireless_mode_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_channel_list_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_scan_in_progress_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_forced_data_rate_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_wireless_mode_for_scan_list_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_bss_wireless_mode_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_scan_with_magic_packet_hdl(
-			struct oid_par_priv *poid_par_priv);
+uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *oid);/*84*/
+uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_tx_retry_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *oid);/*93*/
+uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_channelplan_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_channelplan_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_bcn_intvl_hdl(struct oid_par_priv *oid);
+uint oid_rt_dedicate_probe_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv *oid);
+uint oid_rt_current_tx_power_level_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_channel_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_key_mismatch_hdl(struct oid_par_priv *oid);
+uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_channel_list_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_scan_in_progress_hdl(struct oid_par_priv *oid);
+uint oid_rt_forced_data_rate_hdl(struct oid_par_priv *oid);
+uint oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv *oid);
 
 /**************  oid_rtl_seg_01_03 section start **************/
-uint oid_rt_ap_get_associated_station_list_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_ap_switch_into_ap_mode_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_ap_supported_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_ap_set_passphrase_hdl(
-			struct oid_par_priv *poid_par_priv);
+uint oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv *oid);
+uint oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_ap_supported_hdl(struct oid_par_priv *oid);
+uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *oid);
 /* oid_rtl_seg_01_11 */
-uint oid_rt_pro_rf_write_registry_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_pro_rf_read_registry_hdl(
-			struct oid_par_priv *poid_par_priv);
+uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv *oid);
+uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *oid);
 /***************  oid_rtl_seg_03_00 section start **************/
-uint oid_rt_get_connect_state_hdl(
-			struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_default_key_id_hdl(
-			struct oid_par_priv *poid_par_priv);
+uint oid_rt_get_connect_state_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_default_key_id_hdl(struct oid_par_priv *oid);
 
 #endif
 
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/4] staging: rtl8712: Rename local variable
  2015-11-25 17:42 ` [PATCH v2 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
@ 2016-02-08  3:51   ` Greg KH
  0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2016-02-08  3:51 UTC (permalink / raw)
  To: Mauro Dreissig; +Cc: Larry.Finger, florian.c.schilhabel, devel, netdev

On Wed, Nov 25, 2015 at 03:42:40PM -0200, Mauro Dreissig wrote:
> Renames all instances of struct _adapter to adapter in rtl871x_ioctl_rtl.c,
> avoiding camel case.
> 
> Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
> ---
>  drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 86 ++++++++++++++---------------
>  1 file changed, 43 insertions(+), 43 deletions(-)

Two patches with the identical subject line isn't good, I can't accept
these, please fix up.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-08  3:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-25 17:42 [PATCH v2 0/4] Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
2015-11-25 17:42 ` [PATCH v2 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
2015-11-25 17:42 ` [PATCH v2 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
2016-02-08  3:51   ` Greg KH
2015-11-25 17:42 ` [PATCH v2 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
2015-11-25 17:42 ` [PATCH v2 4/4] staging: rtl8712: Rename local variable Mauro Dreissig

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.