rtlwifi: rtl8723ae: Clean up the hardware info routine

This driver contains some complicated if ... else if ... else constructions. These are replaced by switch statements to improve readability. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

rtlwifi: rtl8723ae: Clean up the hardware info routine
This driver contains some complicated if ... else if ... else constructions. These are replaced by switch statements to improve readability. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
238ad2dd · Larry Finger · Kalle Valo · a8c9fb2b · 238ad2dd
Commit 238ad2dd authored Jul 05, 2016 by Larry Finger Committed by Kalle Valo Jul 08, 2016
Show whitespace changes
Inline Side-by-side

Showing with 117 additions and 114 deletions

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c +117 -114

No files found.
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -1653,114 +1653,119 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw,
 	rtl8723e_read_bt_coexist_info_from_hwpg(hw,
 			rtlefuse->autoload_failflag, hwinfo);
-	if (rtlhal->oem_id == RT_CID_DEFAULT) {
+	if (rtlhal->oem_id != RT_CID_DEFAULT)
+		return;
 	switch (rtlefuse->eeprom_oemid) {
 	case EEPROM_CID_DEFAULT:
-			if (rtlefuse->eeprom_did == 0x8176) {
+		switch (rtlefuse->eeprom_did) {
-				if (CHK_SVID_SMID(0x10EC, 0x6151) ||
+		case 0x8176:
-				    CHK_SVID_SMID(0x10EC, 0x6152) ||
+			switch (rtlefuse->eeprom_svid) {
-				    CHK_SVID_SMID(0x10EC, 0x6154) ||
+			case 0x10EC:
-				    CHK_SVID_SMID(0x10EC, 0x6155) ||
+				switch (rtlefuse->eeprom_smid) {
-				    CHK_SVID_SMID(0x10EC, 0x6177) ||
+				case 0x6151 ... 0x6152:
-				    CHK_SVID_SMID(0x10EC, 0x6178) ||
+				case 0x6154 ... 0x6155:
-				    CHK_SVID_SMID(0x10EC, 0x6179) ||
+				case 0x6177 ... 0x6180:
-				    CHK_SVID_SMID(0x10EC, 0x6180) ||
+				case 0x7151 ... 0x7152:
-				    CHK_SVID_SMID(0x10EC, 0x7151) ||
+				case 0x7154 ... 0x7155:
-				    CHK_SVID_SMID(0x10EC, 0x7152) ||
+				case 0x7177 ... 0x7180:
-				    CHK_SVID_SMID(0x10EC, 0x7154) ||
+				case 0x8151 ... 0x8152:
-				    CHK_SVID_SMID(0x10EC, 0x7155) ||
+				case 0x8154 ... 0x8155:
-				    CHK_SVID_SMID(0x10EC, 0x7177) ||
+				case 0x8181 ... 0x8182:
-				    CHK_SVID_SMID(0x10EC, 0x7178) ||
+				case 0x8184 ... 0x8185:
-				    CHK_SVID_SMID(0x10EC, 0x7179) ||
+				case 0x9151 ... 0x9152:
-				    CHK_SVID_SMID(0x10EC, 0x7180) ||
+				case 0x9154 ... 0x9155:
-				    CHK_SVID_SMID(0x10EC, 0x8151) ||
+				case 0x9181 ... 0x9182:
-				    CHK_SVID_SMID(0x10EC, 0x8152) ||
+				case 0x9184 ... 0x9185:
-				    CHK_SVID_SMID(0x10EC, 0x8154) ||
-				    CHK_SVID_SMID(0x10EC, 0x8155) ||
-				    CHK_SVID_SMID(0x10EC, 0x8181) ||
-				    CHK_SVID_SMID(0x10EC, 0x8182) ||
-				    CHK_SVID_SMID(0x10EC, 0x8184) ||
-				    CHK_SVID_SMID(0x10EC, 0x8185) ||
-				    CHK_SVID_SMID(0x10EC, 0x9151) ||
-				    CHK_SVID_SMID(0x10EC, 0x9152) ||
-				    CHK_SVID_SMID(0x10EC, 0x9154) ||
-				    CHK_SVID_SMID(0x10EC, 0x9155) ||
-				    CHK_SVID_SMID(0x10EC, 0x9181) ||
-				    CHK_SVID_SMID(0x10EC, 0x9182) ||
-				    CHK_SVID_SMID(0x10EC, 0x9184) ||
-				    CHK_SVID_SMID(0x10EC, 0x9185))
 					rtlhal->oem_id = RT_CID_TOSHIBA;
-				else if (rtlefuse->eeprom_svid == 0x1025)
+					break;
-					rtlhal->oem_id = RT_CID_819X_ACER;
+				case 0x6191 ... 0x6193:
-				else if (CHK_SVID_SMID(0x10EC, 0x6191) ||
+				case 0x7191 ... 0x7193:
-					 CHK_SVID_SMID(0x10EC, 0x6192) ||
+				case 0x8191 ... 0x8193:
-					 CHK_SVID_SMID(0x10EC, 0x6193) ||
+				case 0x9191 ... 0x9193:
-					 CHK_SVID_SMID(0x10EC, 0x7191) ||
-					 CHK_SVID_SMID(0x10EC, 0x7192) ||
-					 CHK_SVID_SMID(0x10EC, 0x7193) ||
-					 CHK_SVID_SMID(0x10EC, 0x8191) ||
-					 CHK_SVID_SMID(0x10EC, 0x8192) ||
-					 CHK_SVID_SMID(0x10EC, 0x8193) ||
-					 CHK_SVID_SMID(0x10EC, 0x9191) ||
-					 CHK_SVID_SMID(0x10EC, 0x9192) ||
-					 CHK_SVID_SMID(0x10EC, 0x9193))
 					rtlhal->oem_id = RT_CID_819X_SAMSUNG;
-				else if (CHK_SVID_SMID(0x10EC, 0x8195) ||
+					break;
-					 CHK_SVID_SMID(0x10EC, 0x9195) ||
+				case 0x8197:
-					 CHK_SVID_SMID(0x10EC, 0x7194) ||
+				case 0x9196:
-					 CHK_SVID_SMID(0x10EC, 0x8200) ||
-					 CHK_SVID_SMID(0x10EC, 0x8201) ||
-					 CHK_SVID_SMID(0x10EC, 0x8202) ||
-					 CHK_SVID_SMID(0x10EC, 0x9200))
-					rtlhal->oem_id = RT_CID_819X_LENOVO;
-				else if (CHK_SVID_SMID(0x10EC, 0x8197) ||
-					 CHK_SVID_SMID(0x10EC, 0x9196))
 					rtlhal->oem_id = RT_CID_819X_CLEVO;
-				else if (CHK_SVID_SMID(0x1028, 0x8194) ||
+					break;
-					 CHK_SVID_SMID(0x1028, 0x8198) ||
+				case 0x8203:
-					 CHK_SVID_SMID(0x1028, 0x9197) ||
+					rtlhal->oem_id = RT_CID_819X_PRONETS;
-					 CHK_SVID_SMID(0x1028, 0x9198))
+					break;
+				case 0x8195:
+				case 0x9195:
+				case 0x7194:
+				case 0x8200 ... 0x8202:
+				case 0x9200:
+					rtlhal->oem_id = RT_CID_819X_LENOVO;
+					break;
+				}
+			case 0x1025:
+				rtlhal->oem_id = RT_CID_819X_ACER;
+				break;
+			case 0x1028:
+				switch (rtlefuse->eeprom_smid) {
+				case 0x8194:
+				case 0x8198:
+				case 0x9197 ... 0x9198:
 					rtlhal->oem_id = RT_CID_819X_DELL;
-				else if (CHK_SVID_SMID(0x103C, 0x1629))
+					break;
+				}
+				break;
+			case 0x103C:
+				switch (rtlefuse->eeprom_smid) {
+				case 0x1629:
 					rtlhal->oem_id = RT_CID_819X_HP;
-				else if (CHK_SVID_SMID(0x1A32, 0x2315))
+				}
+				break;
+			case 0x1A32:
+				switch (rtlefuse->eeprom_smid) {
+				case 0x2315:
 					rtlhal->oem_id = RT_CID_819X_QMI;
-				else if (CHK_SVID_SMID(0x10EC, 0x8203))
+					break;
-					rtlhal->oem_id = RT_CID_819X_PRONETS;
+				}
-				else if (CHK_SVID_SMID(0x1043, 0x84B5))
+				break;
+			case 0x1043:
+				switch (rtlefuse->eeprom_smid) {
+				case 0x84B5:
 					rtlhal->oem_id =
 						RT_CID_819X_EDIMAX_ASUS;
-				else
+				}
-					rtlhal->oem_id = RT_CID_DEFAULT;
+				break;
-			} else if (rtlefuse->eeprom_did == 0x8178) {
+			}
-				if (CHK_SVID_SMID(0x10EC, 0x6181) ||
+			break;
-				    CHK_SVID_SMID(0x10EC, 0x6182) ||
+		case 0x8178:
-				    CHK_SVID_SMID(0x10EC, 0x6184) ||
+			switch (rtlefuse->eeprom_svid) {
-				    CHK_SVID_SMID(0x10EC, 0x6185) ||
+			case 0x10ec:
-				    CHK_SVID_SMID(0x10EC, 0x7181) ||
+				switch (rtlefuse->eeprom_smid) {
-				    CHK_SVID_SMID(0x10EC, 0x7182) ||
+				case 0x6181 ... 0x6182:
-				    CHK_SVID_SMID(0x10EC, 0x7184) ||
+				case 0x6184 ... 0x6185:
-				    CHK_SVID_SMID(0x10EC, 0x7185) ||
+				case 0x7181 ... 0x7182:
-				    CHK_SVID_SMID(0x10EC, 0x8181) ||
+				case 0x7184 ... 0x7185:
-				    CHK_SVID_SMID(0x10EC, 0x8182) ||
+				case 0x8181 ... 0x8182:
-				    CHK_SVID_SMID(0x10EC, 0x8184) ||
+				case 0x8184 ... 0x8185:
-				    CHK_SVID_SMID(0x10EC, 0x8185) ||
+				case 0x9181 ... 0x9182:
-				    CHK_SVID_SMID(0x10EC, 0x9181) ||
+				case 0x9184 ... 0x9185:
-				    CHK_SVID_SMID(0x10EC, 0x9182) ||
-				    CHK_SVID_SMID(0x10EC, 0x9184) ||
-				    CHK_SVID_SMID(0x10EC, 0x9185))
 					rtlhal->oem_id = RT_CID_TOSHIBA;
-				else if (rtlefuse->eeprom_svid == 0x1025)
+					break;
+				case 0x8186:
+					rtlhal->oem_id =
+						RT_CID_819X_PRONETS;
+					break;
+				}
+				break;
+			case 0x1025:
 				rtlhal->oem_id = RT_CID_819X_ACER;
-				else if (CHK_SVID_SMID(0x10EC, 0x8186))
+				break;
-					rtlhal->oem_id = RT_CID_819X_PRONETS;
+			case 0x1043:
-				else if (CHK_SVID_SMID(0x1043, 0x8486))
+				switch (rtlefuse->eeprom_smid) {
+				case 0x8486:
 					rtlhal->oem_id =
 					     RT_CID_819X_EDIMAX_ASUS;
-				else
+				}
-					rtlhal->oem_id = RT_CID_DEFAULT;
+				break;
-			} else {
+			}
-				rtlhal->oem_id = RT_CID_DEFAULT;
+			break;
 		}
 		break;
 	case EEPROM_CID_TOSHIBA:
@@ -1777,8 +1782,6 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw,
 	default:
 		rtlhal->oem_id = RT_CID_DEFAULT;
 		break;
-		}
 	}
 exit:
 	kfree(hwinfo);