Commit 60d18ddb authored by Bitterblue Smith's avatar Bitterblue Smith Committed by Kalle Valo
Browse files

wifi: rtl8xxxu: Use u32_get_bits in *_identify_chip 



It simplifies the code a bit.

Suggested-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarBitterblue Smith <rtl8821cerfe2@gmail.com>
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/68f94284-3728-7b75-2b7b-64fae8af6bc5@gmail.com
parent 9b00565a

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c

+1 −2
Original line number Diff line number Diff line
@@ -335,8 +335,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv) 
	priv->has_wifi = 1;



	sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);

	priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >>

		SYS_CFG_CHIP_VERSION_SHIFT;

	priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);

	if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {

		dev_info(dev, "Unsupported test chip\n");

		ret = -ENOTSUPP;

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c

+2 −3
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv) 
	int ret = 0;



	sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);

	priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >>

		SYS_CFG_CHIP_VERSION_SHIFT;

	priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);

	if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {

		dev_info(dev, "Unsupported test chip\n");

		ret = -ENOTSUPP;
@@ -371,7 +370,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv) 
	rtl8xxxu_identify_vendor_1bit(priv, vendor);



	val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);

	priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28;

	priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);



	rtl8xxxu_config_endpoints_sie(priv);

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c

+2 −3
Original line number Diff line number Diff line
@@ -485,8 +485,7 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv) 
	int ret = 0;



	sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);

	priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >>

		SYS_CFG_CHIP_VERSION_SHIFT;

	priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);

	if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {

		dev_info(dev, "Unsupported test chip\n");

		ret = -ENOTSUPP;
@@ -512,7 +511,7 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv) 
	rtl8xxxu_identify_vendor_2bits(priv, vendor);



	val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);

	priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28;

	priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);



	rtl8xxxu_config_endpoints_sie(priv);

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c

+2 −3
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv) 
	int ret = 0;



	sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);

	priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >>

		SYS_CFG_CHIP_VERSION_SHIFT;

	priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);

	if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {

		dev_info(dev, "Unsupported test chip\n");

		ret = -ENOTSUPP;
@@ -165,7 +164,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv) 
	rtl8xxxu_identify_vendor_1bit(priv, vendor);



	val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);

	priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28;

	priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);



	rtl8xxxu_config_endpoints_sie(priv);

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c

+2 −3
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv) 
	int ret = 0;



	sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);

	priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >>

		SYS_CFG_CHIP_VERSION_SHIFT;

	priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);

	if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {

		dev_info(dev, "Unsupported test chip\n");

		ret = -ENOTSUPP;
@@ -338,7 +337,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv) 
	rtl8xxxu_identify_vendor_2bits(priv, vendor);



	val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);

	priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28;

	priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);



	rtl8xxxu_config_endpoints_sie(priv);