Commit 38b2b2e8 authored by Frank A. Cancio Bello's avatar Frank A. Cancio Bello Committed by Greg Kroah-Hartman
Browse files

staging: rtlwifi: phydm: Remove useless parentheses 



Remove unnecessary parentheses to comply with preferred coding style for
the linux kernel and avoid the following checkpatch's message:
'CHECK: Unnecessary parentheses around'.

Credits to checkpatch.

Signed-off-by: default avatarFrank A. Cancio Bello <frank@generalsoftwareinc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a221cb09

drivers/staging/rtlwifi/phydm/halphyrf_ce.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ void odm_txpowertracking_callback_thermal_meter(void *dm_void) 


		if (xtal_offset_eanble != 0 &&

		    cali_info->txpowertrack_control &&

		    (rtlefu->eeprom_thermalmeter != 0xff)) {

		    rtlefu->eeprom_thermalmeter != 0xff) {

			ODM_RT_TRACE(

				dm, ODM_COMP_TX_PWR_TRACK,

				"**********Enter Xtal Tracking**********\n");

drivers/staging/rtlwifi/phydm/phydm.c

+4 −4
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ static void odm_update_power_training_state(struct phy_dm_struct *dm) 
		return;



	/* First connect */

	if ((dm->is_linked) && !dig_tab->is_media_connect_0) {

	if (dm->is_linked && !dig_tab->is_media_connect_0) {

		dm->PT_score = 0;

		dm->is_change_state = true;

		dm->phy_dbg_info.num_qry_phy_status_ofdm = 0;
@@ -1360,7 +1360,7 @@ static void odm_update_power_training_state(struct phy_dm_struct *dm) 
			     (u32)(dm->phy_dbg_info.num_qry_phy_status_cck);



		if ((false_alm_cnt->cnt_cca_all > 31 && rx_pkt_cnt > 31) &&

		    (false_alm_cnt->cnt_cca_all >= rx_pkt_cnt)) {

		    false_alm_cnt->cnt_cca_all >= rx_pkt_cnt) {

			if ((rx_pkt_cnt + (rx_pkt_cnt >> 1)) <=

			    false_alm_cnt->cnt_cca_all)

				score = 0;
@@ -1697,7 +1697,7 @@ static u8 phydm_calculate_fc(void *dm_void, u32 channel, u32 bw, u32 second_ch, 


		fc = 2412 + (channel - 1) * 5;



		if (bw == 40 && (second_ch == PHYDM_ABOVE)) {

		if (bw == 40 && second_ch == PHYDM_ABOVE) {

			if (channel >= 10) {

				ODM_RT_TRACE(

					dm, ODM_COMP_API,
@@ -1774,7 +1774,7 @@ static u8 phydm_calculate_intf_distance(void *dm_void, u32 bw, u32 fc, 
		     "[f_l, fc, fh] = [ %d, %d, %d ], f_int = ((%d))\n", bw_low,

		     fc, bw_up, f_interference);



	if ((f_interference >= bw_low) && (f_interference <= bw_up)) {

	if (f_interference >= bw_low && f_interference <= bw_up) {

		int_distance = (fc >= f_interference) ? (fc - f_interference) :

							(f_interference - fc);

		tone_idx_tmp =

drivers/staging/rtlwifi/phydm/phydm_adaptivity.c

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ void phydm_adaptivity(void *dm_void) 
		dm->rssi_min, adaptivity->adajust_igi_level,

		dm->adaptivity_flag, dm->adaptivity_enable);



	if (adaptivity->dynamic_link_adaptivity && (!dm->is_linked) &&

	if (adaptivity->dynamic_link_adaptivity && !dm->is_linked &&

	    !dm->adaptivity_enable) {

		phydm_set_edcca_threshold(dm, 0x7f, 0x7f);

		ODM_RT_TRACE(
@@ -773,7 +773,7 @@ void phydm_adaptivity(void *dm_void) 


	if (dm->support_ic_type &

	    (ODM_IC_11AC_GAIN_IDX_EDCCA | ODM_IC_11N_GAIN_IDX_EDCCA)) {

		if ((adaptivity->adajust_igi_level > IGI) &&

		if (adaptivity->adajust_igi_level > IGI &&

		    dm->adaptivity_enable)

			diff = adaptivity->adajust_igi_level - IGI;

drivers/staging/rtlwifi/phydm/phydm_debug.c

+4 −4
Original line number Diff line number Diff line
@@ -1442,9 +1442,9 @@ static void phydm_get_per_path_txagc(void *dm_void, u8 path, u32 *_used, 
	u32 out_len = *_out_len;



	if (((dm->support_ic_type & (ODM_RTL8822B | ODM_RTL8197F)) &&

	     (path <= ODM_RF_PATH_B)) ||

	     path <= ODM_RF_PATH_B) ||

	    ((dm->support_ic_type & (ODM_RTL8821C)) &&

	     (path <= ODM_RF_PATH_A))) {

	     path <= ODM_RF_PATH_A)) {

		for (rate_idx = 0; rate_idx <= 0x53; rate_idx++) {

			if (rate_idx == ODM_RATE1M)

				PHYDM_SNPRINTF(output + used, out_len - used,
@@ -2530,7 +2530,7 @@ void phydm_cmd_parser(struct phy_dm_struct *dm, char input[][MAX_ARGV], 
		}



		/* NMH trigger */

		if ((var1[0] <= 2) && (var1[0] != 0)) {

		if (var1[0] <= 2 && var1[0] != 0) {

			ccx_info->echo_NHM_en = true;

			ccx_info->echo_IGI =

				(u8)odm_get_bb_reg(dm, 0xC50, MASKBYTE0);
@@ -2808,7 +2808,7 @@ void phydm_fw_trace_handler(void *dm_void, u8 *cmd_buf, u8 cmd_len) 
	freg_num = (buf_0 & 0xf);

	c2h_seq = (buf_0 & 0xf0) >> 4;



	if ((c2h_seq != dm->pre_c2h_seq) && !dm->fw_buff_is_enpty) {

	if (c2h_seq != dm->pre_c2h_seq && !dm->fw_buff_is_enpty) {

		dm->fw_debug_trace[dm->c2h_cmd_start] = '\0';

		ODM_RT_TRACE(dm, ODM_FW_DEBUG_TRACE,

			     "[FW Dbg Queue Overflow] %s\n",

drivers/staging/rtlwifi/phydm/phydm_dig.c

+11 −11
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static u8 odm_forbidden_igi_check(void *dm_void, u8 dig_dynamic_min, 
		if ((fa_cnt->cnt_all >

		     (fa_cnt->cnt_all_pre + (fa_cnt->cnt_all_pre >> 3) +

		      (fa_cnt->cnt_all_pre >> 4))) &&

		    (current_igi < dig_tab->pre_ig_value)) {

		    current_igi < dig_tab->pre_ig_value) {

			if (dig_tab->large_fa_hit != 3)

				dig_tab->large_fa_hit++;
@@ -319,7 +319,7 @@ void odm_write_dig(void *dm_void, u8 current_igi) 
		     __func__, ODM_REG(IGI_A, dm), ODM_BIT(IGI, dm));



	/* 1 Check initial gain by upper bound */

	if ((!dig_tab->is_psd_in_progress) && dm->is_linked) {

	if (!dig_tab->is_psd_in_progress && dm->is_linked) {

		if (current_igi > dig_tab->rx_gain_range_max) {

			ODM_RT_TRACE(

				dm, ODM_COMP_DIG,
@@ -353,7 +353,7 @@ void odm_write_dig(void *dm_void, u8 current_igi) 


		/*Add by YuChen for USB IO too slow issue*/

		if ((dm->support_ability & ODM_BB_ADAPTIVITY) &&

		    (current_igi > dig_tab->cur_ig_value)) {

		    current_igi > dig_tab->cur_ig_value) {

			dig_tab->cur_ig_value = current_igi;

			phydm_adaptivity(dm);

		}
@@ -388,7 +388,7 @@ void odm_pause_dig(void *dm_void, enum phydm_pause_type pause_type, 
	ODM_RT_TRACE(dm, ODM_COMP_DIG, "%s()=========> level = %d\n", __func__,

		     pause_level);



	if ((dig_tab->pause_dig_level == 0) &&

	if (dig_tab->pause_dig_level == 0 &&

	    (!(dm->support_ability & ODM_BB_DIG) ||

	     !(dm->support_ability & ODM_BB_FA_CNT))) {

		ODM_RT_TRACE(
@@ -720,7 +720,7 @@ void odm_DIG(void *dm_void) 
		/* 4 Modify DIG upper bound for 92E, 8723A\B, 8821 & 8812 BT */

		if ((dm->support_ic_type & (ODM_RTL8192E | ODM_RTL8723B |

					    ODM_RTL8812 | ODM_RTL8821)) &&

		    (dm->is_bt_limited_dig == 1)) {

		    dm->is_bt_limited_dig == 1) {

			offset = 10;

			ODM_RT_TRACE(

				dm, ODM_COMP_DIG,
@@ -819,8 +819,8 @@ void odm_DIG(void *dm_void) 
	if (dm->is_linked && !first_connect) {

		ODM_RT_TRACE(dm, ODM_COMP_DIG, "Beacon Num (%d)\n",

			     dm->phy_dbg_info.num_qry_beacon_pkt);

		if ((dm->phy_dbg_info.num_qry_beacon_pkt < 5) &&

		    (dm->bsta_state)) {

		if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 &&

		    dm->bsta_state) {

			dig_tab->rx_gain_range_min = 0x1c;

			ODM_RT_TRACE(

				dm, ODM_COMP_DIG,
@@ -882,9 +882,9 @@ void odm_DIG(void *dm_void) 
				current_igi = current_igi - 2;



			/* 4 Abnormal # beacon case */

			if ((dm->phy_dbg_info.num_qry_beacon_pkt < 5) &&

			    (fa_cnt->cnt_all < DM_DIG_FA_TH1) &&

			    (dm->bsta_state)) {

			if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 &&

			    fa_cnt->cnt_all < DM_DIG_FA_TH1 &&

			    dm->bsta_state) {

				current_igi = dig_tab->rx_gain_range_min;

				ODM_RT_TRACE(

					dm, ODM_COMP_DIG,
@@ -1321,7 +1321,7 @@ void odm_pause_cck_packet_detection(void *dm_void, 
	ODM_RT_TRACE(dm, ODM_COMP_DIG, "%s()=========> level = %d\n", __func__,

		     pause_level);



	if ((dig_tab->pause_cckpd_level == 0) &&

	if (dig_tab->pause_cckpd_level == 0 &&

	    (!(dm->support_ability & ODM_BB_CCK_PD) ||

	     !(dm->support_ability & ODM_BB_FA_CNT))) {

		ODM_RT_TRACE(

CRA Git | Maintained and supported by SUSTech CRA and CCSE