Commit 8001c741 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtw89: change value assignment style of rtw89_mac_cfg_gnt() 



Use if() style would be clear than "? :", because the else cases are
always 0. The read val from rtw89_mac_read_lte() isn't used, so remove
this statement.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220317055543.40514-11-pkshih@realtek.com
parent feed6541

drivers/net/wireless/realtek/rtw89/mac.c

+25 −22
Original line number Diff line number Diff line
@@ -3621,29 +3621,32 @@ EXPORT_SYMBOL(rtw89_mac_coex_init); 
int rtw89_mac_cfg_gnt(struct rtw89_dev *rtwdev,

		      const struct rtw89_mac_ax_coex_gnt *gnt_cfg)

{

	u32 val, ret;

	u32 val = 0, ret;



	if (gnt_cfg->band[0].gnt_bt)

		val |= B_AX_GNT_BT_RFC_S0_SW_VAL | B_AX_GNT_BT_BB_S0_SW_VAL;



	if (gnt_cfg->band[0].gnt_bt_sw_en)

		val |= B_AX_GNT_BT_RFC_S0_SW_CTRL | B_AX_GNT_BT_BB_S0_SW_CTRL;



	if (gnt_cfg->band[0].gnt_wl)

		val |= B_AX_GNT_WL_RFC_S0_SW_VAL | B_AX_GNT_WL_BB_S0_SW_VAL;



	if (gnt_cfg->band[0].gnt_wl_sw_en)

		val |= B_AX_GNT_WL_RFC_S0_SW_CTRL | B_AX_GNT_WL_BB_S0_SW_CTRL;



	if (gnt_cfg->band[1].gnt_bt)

		val |= B_AX_GNT_BT_RFC_S1_SW_VAL | B_AX_GNT_BT_BB_S1_SW_VAL;



	if (gnt_cfg->band[1].gnt_bt_sw_en)

		val |= B_AX_GNT_BT_RFC_S1_SW_CTRL | B_AX_GNT_BT_BB_S1_SW_CTRL;



	if (gnt_cfg->band[1].gnt_wl)

		val |= B_AX_GNT_WL_RFC_S1_SW_VAL | B_AX_GNT_WL_BB_S1_SW_VAL;



	if (gnt_cfg->band[1].gnt_wl_sw_en)

		val |= B_AX_GNT_WL_RFC_S1_SW_CTRL | B_AX_GNT_WL_BB_S1_SW_CTRL;



	ret = rtw89_mac_read_lte(rtwdev, R_AX_LTE_SW_CFG_1, &val);

	if (ret) {

		rtw89_err(rtwdev, "Read LTE fail!\n");

		return ret;

	}

	val = (gnt_cfg->band[0].gnt_bt ?

	       B_AX_GNT_BT_RFC_S0_SW_VAL | B_AX_GNT_BT_BB_S0_SW_VAL : 0) |

	      (gnt_cfg->band[0].gnt_bt_sw_en ?

	       B_AX_GNT_BT_RFC_S0_SW_CTRL | B_AX_GNT_BT_BB_S0_SW_CTRL : 0) |

	      (gnt_cfg->band[0].gnt_wl ?

	       B_AX_GNT_WL_RFC_S0_SW_VAL | B_AX_GNT_WL_BB_S0_SW_VAL : 0) |

	      (gnt_cfg->band[0].gnt_wl_sw_en ?

	       B_AX_GNT_WL_RFC_S0_SW_CTRL | B_AX_GNT_WL_BB_S0_SW_CTRL : 0) |

	      (gnt_cfg->band[1].gnt_bt ?

	       B_AX_GNT_BT_RFC_S1_SW_VAL | B_AX_GNT_BT_BB_S1_SW_VAL : 0) |

	      (gnt_cfg->band[1].gnt_bt_sw_en ?

	       B_AX_GNT_BT_RFC_S1_SW_CTRL | B_AX_GNT_BT_BB_S1_SW_CTRL : 0) |

	      (gnt_cfg->band[1].gnt_wl ?

	       B_AX_GNT_WL_RFC_S1_SW_VAL | B_AX_GNT_WL_BB_S1_SW_VAL : 0) |

	      (gnt_cfg->band[1].gnt_wl_sw_en ?

	       B_AX_GNT_WL_RFC_S1_SW_CTRL | B_AX_GNT_WL_BB_S1_SW_CTRL : 0);

	ret = rtw89_mac_write_lte(rtwdev, R_AX_LTE_SW_CFG_1, val);

	if (ret) {

		rtw89_err(rtwdev, "Write LTE fail!\n");