1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index c477be06894e..70f3fa69c9a4 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -165,7 +165,7 @@ static void ath_rx_addbuffer_edma(struct ath_softc *sc,
         u32 nbuf = 0;
 
         if (list_empty(&sc->rx.rxbuf)) {
-                ath_print(common, ATH_DBG_QUEUE, "No free rx buf available\n");
+                ath_dbg(common, ATH_DBG_QUEUE, "No free rx buf available\n");
                 return;
         }
 
@@ -327,8 +327,8 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
                 common->rx_bufsize = roundup(IEEE80211_MAX_MPDU_LEN,
                                 min(common->cachelsz, (u16)64));
 
-                ath_print(common, ATH_DBG_CONFIG, "cachelsz %u rxbufsize %u\n",
-                                common->cachelsz, common->rx_bufsize);
+                ath_dbg(common, ATH_DBG_CONFIG, "cachelsz %u rxbufsize %u\n",
+                        common->cachelsz, common->rx_bufsize);
 
                 /* Initialize rx descriptors */
 
@@ -590,9 +590,8 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
 
         if (sc->ps_flags & PS_BEACON_SYNC) {
                 sc->ps_flags &= ~PS_BEACON_SYNC;
-                ath_print(common, ATH_DBG_PS,
-                          "Reconfigure Beacon timers based on "
-                          "timestamp from the AP\n");
+                ath_dbg(common, ATH_DBG_PS,
+                        "Reconfigure Beacon timers based on timestamp from the AP\n");
                 ath_beacon_config(sc, NULL);
         }
 
@@ -604,8 +603,8 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
                  * a backup trigger for returning into NETWORK SLEEP state,
                  * so we are waiting for it as well.
                  */
-                ath_print(common, ATH_DBG_PS, "Received DTIM beacon indicating "
-                          "buffered broadcast/multicast frame(s)\n");
+                ath_dbg(common, ATH_DBG_PS,
+                        "Received DTIM beacon indicating buffered broadcast/multicast frame(s)\n");
                 sc->ps_flags |= PS_WAIT_FOR_CAB | PS_WAIT_FOR_BEACON;
                 return;
         }
@@ -617,8 +616,8 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
                  * been delivered.
                  */
                 sc->ps_flags &= ~PS_WAIT_FOR_CAB;
-                ath_print(common, ATH_DBG_PS,
-                          "PS wait for CAB frames timed out\n");
+                ath_dbg(common, ATH_DBG_PS,
+                        "PS wait for CAB frames timed out\n");
         }
 }
 
@@ -643,15 +642,14 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb)
                  * point.
                  */
                 sc->ps_flags &= ~(PS_WAIT_FOR_CAB | PS_WAIT_FOR_BEACON);
-                ath_print(common, ATH_DBG_PS,
-                          "All PS CAB frames received, back to sleep\n");
+                ath_dbg(common, ATH_DBG_PS,
+                        "All PS CAB frames received, back to sleep\n");
         } else if ((sc->ps_flags & PS_WAIT_FOR_PSPOLL_DATA) &&
                    !is_multicast_ether_addr(hdr->addr1) &&
                    !ieee80211_has_morefrags(hdr->frame_control)) {
                 sc->ps_flags &= ~PS_WAIT_FOR_PSPOLL_DATA;
-                ath_print(common, ATH_DBG_PS,
-                          "Going back to sleep after having received "
-                          "PS-Poll data (0x%lx)\n",
+                ath_dbg(common, ATH_DBG_PS,
+                        "Going back to sleep after having received PS-Poll data (0x%lx)\n",
                         sc->ps_flags & (PS_WAIT_FOR_BEACON |
                                         PS_WAIT_FOR_CAB |
                                         PS_WAIT_FOR_PSPOLL_DATA |
@@ -953,8 +951,9 @@ static int ath9k_process_rate(struct ath_common *common,
          * No valid hardware bitrate found -- we should not get here
          * because hardware has already validated this frame as OK.
          */
-        ath_print(common, ATH_DBG_XMIT, "unsupported hw bitrate detected "
-                  "0x%02x using 1 Mbit\n", rx_stats->rs_rate);
+        ath_dbg(common, ATH_DBG_XMIT,
+                "unsupported hw bitrate detected 0x%02x using 1 Mbit\n",
+                rx_stats->rs_rate);
 
         return -EINVAL;
 }