Formatting and style cleanup in rtl8712
cover Formatting and style cleanup in rtl8712
This patch series addresses the use of unnecessary return variables and line-breaks in function headers, both in drivers/staging/rtl8712/rtl871x_mp_ioctl.c.
Wambui Karuga (2):
staging: rtl8712: remove unnecessary return variables
staging: rtl8712: clean up function headers
drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 103 ++++++++------------- 1 file changed, 38 insertions(+), 65 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/2 staging: rtl8712: remove unnecessary return variables
Remove variables that are only used to hold and return constants and have the functions directly return the constants.
Issue found by coccinelle:
@@
local idexpression ret;
expression e;
@@
-ret =
+return
e;
-return ret;
Signed-off-by Wambui Karuga <[email protected]>
--- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 46 +++++++++------------- 1 file changed, 19 insertions(+), 27 deletions(-)
drivers/staging/rtl8712/rtl871x_mp_ioctl.c +19 -27
@@ -283,13 +283,12 @@ uint oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context); -uint status =RNDIS_STATUS_SUCCESS ;if (poid_par_priv->type_of_oid !=SET_OID )return RNDIS_STATUS_NOT_ACCEPTED ;if (mp_stop_test (Adapter) == _FAIL) - status =RNDIS_STATUS_NOT_ACCEPTED ; -return status; +return RNDIS_STATUS_NOT_ACCEPTED ; +return RNDIS_STATUS_SUCCESS ; } uint oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv
@@ -350,64 +349,58 @@ uint oid_rt_pro_set_tx_power_control_hdl(uint oid_rt_pro_query_tx_packet_sent_hdl (struct oid_par_priv *poid_par_priv) { -uint status =RNDIS_STATUS_SUCCESS ;struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context); -if (poid_par_priv->type_of_oid !=QUERY_OID ) { - status =RNDIS_STATUS_NOT_ACCEPTED ; -return status; - } +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->mppriv.tx_pktcount; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; }else { - status =RNDIS_STATUS_INVALID_LENGTH ; +return RNDIS_STATUS_INVALID_LENGTH ; } -return status; +return RNDIS_STATUS_SUCCESS ; }uint oid_rt_pro_query_rx_packet_received_hdl (struct oid_par_priv *poid_par_priv) { -uint status =RNDIS_STATUS_SUCCESS ;struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context); -if (poid_par_priv->type_of_oid !=QUERY_OID ) { - status =RNDIS_STATUS_NOT_ACCEPTED ; -return status; - } +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->mppriv.rx_pktcount; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; }else { - status =RNDIS_STATUS_INVALID_LENGTH ; +return RNDIS_STATUS_INVALID_LENGTH ; } -return status; +return RNDIS_STATUS_SUCCESS ; }uint oid_rt_pro_query_rx_packet_crc32_error_hdl (struct oid_par_priv *poid_par_priv) { -uint status =RNDIS_STATUS_SUCCESS ;struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context); -if (poid_par_priv->type_of_oid !=QUERY_OID ) { - status =RNDIS_STATUS_NOT_ACCEPTED ; -return status; - } +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->mppriv.rx_crcerrpktcount; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; }else { - status =RNDIS_STATUS_INVALID_LENGTH ; +return RNDIS_STATUS_INVALID_LENGTH ; } -return status; +return RNDIS_STATUS_SUCCESS ; } uint oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv
@@ -425,7 +418,6 @@ uint oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_privuint oid_rt_pro_reset_rx_packet_received_hdl (struct oid_par_priv *poid_par_priv) { -uint status =RNDIS_STATUS_SUCCESS ;struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -435,9 +427,9 @@ uint oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv Adapter->mppriv.rx_pktcount =0 ; Adapter->mppriv.rx_crcerrpktcount =0 ; }else { - status =RNDIS_STATUS_INVALID_LENGTH ; +return RNDIS_STATUS_INVALID_LENGTH ; } -return status; +return RNDIS_STATUS_SUCCESS ; } uint oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv
Signature · 1 line
2.23.0
PATCH 2/2 staging: rtl8712: clean up function headers
In reply to Wambui KarugaRemove unnecessary line-breaks in function headers to improve readability of function headers.
Signed-off-by Wambui Karuga <[email protected]>
--- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 57 ++++++++-------------- 1 file changed, 19 insertions(+), 38 deletions(-)
drivers/staging/rtl8712/rtl871x_mp_ioctl.c +19 -38
@@ -231,8 +231,7 @@ static int mp_stop_test(struct _adapter *padapter)return _SUCCESS; } -uint oid_rt_pro_set_data_rate_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_data_rate_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -291,8 +290,7 @@ uint oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_channel_direct_call_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_channel_direct_call_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -327,8 +325,7 @@ uint oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_tx_power_control_hdl ( -struct oid_par_priv *poid_par_priv) +uint oid_rt_pro_set_tx_power_control_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -346,8 +343,7 @@ uint oid_rt_pro_set_tx_power_control_hdl(return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_query_tx_packet_sent_hdl ( -struct oid_par_priv *poid_par_priv) +uint oid_rt_pro_query_tx_packet_sent_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -365,8 +361,7 @@ uint oid_rt_pro_query_tx_packet_sent_hdl(return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_query_rx_packet_received_hdl ( -struct oid_par_priv *poid_par_priv) +uint oid_rt_pro_query_rx_packet_received_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -384,8 +379,7 @@ uint oid_rt_pro_query_rx_packet_received_hdl(return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_query_rx_packet_crc32_error_hdl ( -struct oid_par_priv *poid_par_priv) +uint oid_rt_pro_query_rx_packet_crc32_error_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -403,8 +397,7 @@ uint oid_rt_pro_query_rx_packet_crc32_error_hdl(return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_reset_tx_packet_sent_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_reset_tx_packet_sent_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -415,8 +408,7 @@ uint oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_reset_rx_packet_received_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_reset_rx_packet_received_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -432,8 +424,7 @@ uint oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_reset_phy_rx_packet_count_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_reset_phy_rx_packet_count_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -444,8 +435,7 @@ uint oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_get_phy_rx_packet_received_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_get_phy_rx_packet_received_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -460,8 +450,7 @@ uint oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_get_phy_rx_packet_crc32_error_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_get_phy_rx_packet_crc32_error_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -476,8 +465,7 @@ uint oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_modulation_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_modulation_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -489,8 +477,7 @@ uint oid_rt_pro_set_modulation_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_continuous_tx_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_continuous_tx_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -503,8 +490,7 @@ uint oid_rt_pro_set_continuous_tx_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_single_carrier_tx_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_single_carrier_tx_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -517,8 +503,7 @@ uint oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_carrier_suppression_tx_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_carrier_suppression_tx_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -531,8 +516,7 @@ uint oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_set_single_tone_tx_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_set_single_tone_tx_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -545,8 +529,7 @@ uint oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_privreturn RNDIS_STATUS_SUCCESS ; } -uint oid_rt_pro_read_register_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_pro_read_register_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -727,8 +710,7 @@ uint oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) }/*----------------------------------------------------------------------*/ -uint oid_rt_get_efuse_current_size_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_get_efuse_current_size_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
@@ -821,8 +803,7 @@ uint oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)return RNDIS_STATUS_SUCCESS ; } -uint oid_rt_set_rx_packet_type_hdl (struct oid_par_priv - *poid_par_priv) +uint oid_rt_set_rx_packet_type_hdl (struct oid_par_priv *poid_par_priv) {struct _adapter *Adapter = (struct _adapter *) (poid_par_priv->adapter_context);
Signature · 1 line
2.23.0