diff options
author | Joe Perches <joe@perches.com> | 2010-12-02 22:12:36 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 16:34:47 -0500 |
commit | 3800276a40751539a920ef8e0537ef2e19126799 (patch) | |
tree | ccf058ea286aef7faa79aea4236b30c1b8cb757e /drivers/net/wireless/ath/ath9k/htc_drv_init.c | |
parent | 21a99f934949807dc0c9dc7642bbf0081b7582f9 (diff) |
ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err
So these errors are always emitted at KERN_ERR level.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 071d0c97474..20b32f614c1 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |||
@@ -495,37 +495,31 @@ static int ath9k_init_queues(struct ath9k_htc_priv *priv) | |||
495 | 495 | ||
496 | priv->beaconq = ath9k_hw_beaconq_setup(priv->ah); | 496 | priv->beaconq = ath9k_hw_beaconq_setup(priv->ah); |
497 | if (priv->beaconq == -1) { | 497 | if (priv->beaconq == -1) { |
498 | ath_print(common, ATH_DBG_FATAL, | 498 | ath_err(common, "Unable to setup BEACON xmit queue\n"); |
499 | "Unable to setup BEACON xmit queue\n"); | ||
500 | goto err; | 499 | goto err; |
501 | } | 500 | } |
502 | 501 | ||
503 | priv->cabq = ath9k_htc_cabq_setup(priv); | 502 | priv->cabq = ath9k_htc_cabq_setup(priv); |
504 | if (priv->cabq == -1) { | 503 | if (priv->cabq == -1) { |
505 | ath_print(common, ATH_DBG_FATAL, | 504 | ath_err(common, "Unable to setup CAB xmit queue\n"); |
506 | "Unable to setup CAB xmit queue\n"); | ||
507 | goto err; | 505 | goto err; |
508 | } | 506 | } |
509 | 507 | ||
510 | if (!ath9k_htc_txq_setup(priv, WME_AC_BE)) { | 508 | if (!ath9k_htc_txq_setup(priv, WME_AC_BE)) { |
511 | ath_print(common, ATH_DBG_FATAL, | 509 | ath_err(common, "Unable to setup xmit queue for BE traffic\n"); |
512 | "Unable to setup xmit queue for BE traffic\n"); | ||
513 | goto err; | 510 | goto err; |
514 | } | 511 | } |
515 | 512 | ||
516 | if (!ath9k_htc_txq_setup(priv, WME_AC_BK)) { | 513 | if (!ath9k_htc_txq_setup(priv, WME_AC_BK)) { |
517 | ath_print(common, ATH_DBG_FATAL, | 514 | ath_err(common, "Unable to setup xmit queue for BK traffic\n"); |
518 | "Unable to setup xmit queue for BK traffic\n"); | ||
519 | goto err; | 515 | goto err; |
520 | } | 516 | } |
521 | if (!ath9k_htc_txq_setup(priv, WME_AC_VI)) { | 517 | if (!ath9k_htc_txq_setup(priv, WME_AC_VI)) { |
522 | ath_print(common, ATH_DBG_FATAL, | 518 | ath_err(common, "Unable to setup xmit queue for VI traffic\n"); |
523 | "Unable to setup xmit queue for VI traffic\n"); | ||
524 | goto err; | 519 | goto err; |
525 | } | 520 | } |
526 | if (!ath9k_htc_txq_setup(priv, WME_AC_VO)) { | 521 | if (!ath9k_htc_txq_setup(priv, WME_AC_VO)) { |
527 | ath_print(common, ATH_DBG_FATAL, | 522 | ath_err(common, "Unable to setup xmit queue for VO traffic\n"); |
528 | "Unable to setup xmit queue for VO traffic\n"); | ||
529 | goto err; | 523 | goto err; |
530 | } | 524 | } |
531 | 525 | ||
@@ -670,16 +664,15 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, | |||
670 | 664 | ||
671 | ret = ath9k_hw_init(ah); | 665 | ret = ath9k_hw_init(ah); |
672 | if (ret) { | 666 | if (ret) { |
673 | ath_print(common, ATH_DBG_FATAL, | 667 | ath_err(common, |
674 | "Unable to initialize hardware; " | 668 | "Unable to initialize hardware; initialization status: %d\n", |
675 | "initialization status: %d\n", ret); | 669 | ret); |
676 | goto err_hw; | 670 | goto err_hw; |
677 | } | 671 | } |
678 | 672 | ||
679 | ret = ath9k_htc_init_debug(ah); | 673 | ret = ath9k_htc_init_debug(ah); |
680 | if (ret) { | 674 | if (ret) { |
681 | ath_print(common, ATH_DBG_FATAL, | 675 | ath_err(common, "Unable to create debugfs files\n"); |
682 | "Unable to create debugfs files\n"); | ||
683 | goto err_debug; | 676 | goto err_debug; |
684 | } | 677 | } |
685 | 678 | ||