mirror of https://gitee.com/openkylin/linux.git
ath9k: move hw macrevision checker to helper
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
07c10c6177
commit
f9d4a66803
|
@ -627,6 +627,23 @@ static bool ath9k_hw_devid_supported(u16 devid)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool ath9k_hw_macversion_supported(u32 macversion)
|
||||||
|
{
|
||||||
|
switch (macversion) {
|
||||||
|
case AR_SREV_VERSION_5416_PCI:
|
||||||
|
case AR_SREV_VERSION_5416_PCIE:
|
||||||
|
case AR_SREV_VERSION_9160:
|
||||||
|
case AR_SREV_VERSION_9100:
|
||||||
|
case AR_SREV_VERSION_9280:
|
||||||
|
case AR_SREV_VERSION_9285:
|
||||||
|
case AR_SREV_VERSION_9287:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
int ath9k_hw_attach(struct ath_hw *ah)
|
int ath9k_hw_attach(struct ath_hw *ah)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
@ -666,16 +683,7 @@ int ath9k_hw_attach(struct ath_hw *ah)
|
||||||
DPRINTF(ah->ah_sc, ATH_DBG_RESET, "serialize_regmode is %d\n",
|
DPRINTF(ah->ah_sc, ATH_DBG_RESET, "serialize_regmode is %d\n",
|
||||||
ah->config.serialize_regmode);
|
ah->config.serialize_regmode);
|
||||||
|
|
||||||
switch (ah->hw_version.macVersion) {
|
if (!ath9k_hw_macversion_supported(ah->hw_version.macVersion)) {
|
||||||
case AR_SREV_VERSION_5416_PCI:
|
|
||||||
case AR_SREV_VERSION_5416_PCIE:
|
|
||||||
case AR_SREV_VERSION_9160:
|
|
||||||
case AR_SREV_VERSION_9100:
|
|
||||||
case AR_SREV_VERSION_9280:
|
|
||||||
case AR_SREV_VERSION_9285:
|
|
||||||
case AR_SREV_VERSION_9287:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
|
DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
|
||||||
"Mac Chip Rev 0x%02x.%x is not supported by "
|
"Mac Chip Rev 0x%02x.%x is not supported by "
|
||||||
"this driver\n", ah->hw_version.macVersion,
|
"this driver\n", ah->hw_version.macVersion,
|
||||||
|
|
Loading…
Reference in New Issue