aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/phy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/phy.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/phy.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c
index bd4fb076cb08..f3136b2dfb75 100644
--- a/drivers/net/wireless/ath/ath9k/phy.c
+++ b/drivers/net/wireless/ath/ath9k/phy.c
@@ -409,18 +409,16 @@ ath9k_hw_rf_free(struct ath_hw *ah)
409} 409}
410 410
411/** 411/**
412 * ath9k_hw_init_rf - initialize external radio structures 412 * ath9k_hw_rf_alloc_ext_banks - allocates banks for external radio programming
413 * @ah: atheros hardware structure 413 * @ah: atheros hardware structure
414 * @status:
415 * 414 *
416 * Only required for older devices with external AR2133/AR5133 radios. 415 * Only required for older devices with external AR2133/AR5133 radios.
417 */ 416 */
418bool ath9k_hw_init_rf(struct ath_hw *ah, int *status) 417int ath9k_hw_rf_alloc_ext_banks(struct ath_hw *ah)
419{ 418{
420 struct ath_common *common = ath9k_hw_common(ah); 419 struct ath_common *common = ath9k_hw_common(ah);
421 420
422 if (AR_SREV_9280_10_OR_LATER(ah)) 421 BUG_ON(AR_SREV_9280_10_OR_LATER(ah));
423 return true;
424 422
425 ah->analogBank0Data = 423 ah->analogBank0Data =
426 kzalloc((sizeof(u32) * 424 kzalloc((sizeof(u32) *
@@ -453,8 +451,7 @@ bool ath9k_hw_init_rf(struct ath_hw *ah, int *status)
453 || ah->analogBank7Data == NULL) { 451 || ah->analogBank7Data == NULL) {
454 ath_print(common, ATH_DBG_FATAL, 452 ath_print(common, ATH_DBG_FATAL,
455 "Cannot allocate RF banks\n"); 453 "Cannot allocate RF banks\n");
456 *status = -ENOMEM; 454 return -ENOMEM;
457 return false;
458 } 455 }
459 456
460 ah->addac5416_21 = 457 ah->addac5416_21 =
@@ -464,8 +461,7 @@ bool ath9k_hw_init_rf(struct ath_hw *ah, int *status)
464 if (ah->addac5416_21 == NULL) { 461 if (ah->addac5416_21 == NULL) {
465 ath_print(common, ATH_DBG_FATAL, 462 ath_print(common, ATH_DBG_FATAL,
466 "Cannot allocate addac5416_21\n"); 463 "Cannot allocate addac5416_21\n");
467 *status = -ENOMEM; 464 return -ENOMEM;
468 return false;
469 } 465 }
470 466
471 ah->bank6Temp = 467 ah->bank6Temp =
@@ -474,11 +470,10 @@ bool ath9k_hw_init_rf(struct ath_hw *ah, int *status)
474 if (ah->bank6Temp == NULL) { 470 if (ah->bank6Temp == NULL) {
475 ath_print(common, ATH_DBG_FATAL, 471 ath_print(common, ATH_DBG_FATAL,
476 "Cannot allocate bank6Temp\n"); 472 "Cannot allocate bank6Temp\n");
477 *status = -ENOMEM; 473 return -ENOMEM;
478 return false;
479 } 474 }
480 475
481 return true; 476 return 0;
482} 477}
483 478
484/** 479/**