1 files changed, 19 insertions, 17 deletions

diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 4e6891099d43..427b46f558ed 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -38,8 +38,8 @@ static void p54_dump_tx_queue(struct p54_common *priv)
         u32 largest_hole = 0, free;
 
         spin_lock_irqsave(&priv->tx_queue.lock, flags);
-        printk(KERN_DEBUG "%s: / --- tx queue dump (%d entries) ---\n",
-               wiphy_name(priv->hw->wiphy), skb_queue_len(&priv->tx_queue));
+        wiphy_debug(priv->hw->wiphy, "/ --- tx queue dump (%d entries) ---\n",
+                    skb_queue_len(&priv->tx_queue));
 
         prev_addr = priv->rx_start;
         skb_queue_walk(&priv->tx_queue, skb) {
@@ -48,21 +48,23 @@ static void p54_dump_tx_queue(struct p54_common *priv)
                 hdr = (void *) skb->data;
 
                 free = range->start_addr - prev_addr;
-                printk(KERN_DEBUG "%s: | [%02d] => [skb:%p skb_len:0x%04x "
-                       "hdr:{flags:%02x len:%04x req_id:%04x type:%02x} "
-                       "mem:{start:%04x end:%04x, free:%d}]\n",
-                       wiphy_name(priv->hw->wiphy), i++, skb, skb->len,
-                       le16_to_cpu(hdr->flags), le16_to_cpu(hdr->len),
-                       le32_to_cpu(hdr->req_id), le16_to_cpu(hdr->type),
-                       range->start_addr, range->end_addr, free);
+                wiphy_debug(priv->hw->wiphy,
+                            "| [%02d] => [skb:%p skb_len:0x%04x "
+                            "hdr:{flags:%02x len:%04x req_id:%04x type:%02x} "
+                            "mem:{start:%04x end:%04x, free:%d}]\n",
+                            i++, skb, skb->len,
+                            le16_to_cpu(hdr->flags), le16_to_cpu(hdr->len),
+                            le32_to_cpu(hdr->req_id), le16_to_cpu(hdr->type),
+                            range->start_addr, range->end_addr, free);
 
                 prev_addr = range->end_addr;
                 largest_hole = max(largest_hole, free);
         }
         free = priv->rx_end - prev_addr;
         largest_hole = max(largest_hole, free);
-        printk(KERN_DEBUG "%s: \\ --- [free: %d], largest free block: %d ---\n",
-               wiphy_name(priv->hw->wiphy), free, largest_hole);
+        wiphy_debug(priv->hw->wiphy,
+                    "\\ --- [free: %d], largest free block: %d ---\n",
+                    free, largest_hole);
         spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
 }
 #endif /* P54_MM_DEBUG */
@@ -538,8 +540,7 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
         case P54_TRAP_BEACON_TX:
                 break;
         case P54_TRAP_RADAR:
-                printk(KERN_INFO "%s: radar (freq:%d MHz)\n",
-                        wiphy_name(priv->hw->wiphy), freq);
+                wiphy_info(priv->hw->wiphy, "radar (freq:%d mhz)\n", freq);
                 break;
         case P54_TRAP_NO_BEACON:
                 if (priv->vif)
@@ -558,8 +559,8 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
                 wiphy_rfkill_set_hw_state(priv->hw->wiphy, false);
                 break;
         default:
-                printk(KERN_INFO "%s: received event:%x freq:%d\n",
-                       wiphy_name(priv->hw->wiphy), event, freq);
+                wiphy_info(priv->hw->wiphy, "received event:%x freq:%d\n",
+                           event, freq);
                 break;
         }
 }
@@ -584,8 +585,9 @@ static int p54_rx_control(struct p54_common *priv, struct sk_buff *skb)
                 p54_rx_eeprom_readback(priv, skb);
                 break;
         default:
-                printk(KERN_DEBUG "%s: not handling 0x%02x type control frame\n",
-                       wiphy_name(priv->hw->wiphy), le16_to_cpu(hdr->type));
+                wiphy_debug(priv->hw->wiphy,
+                            "not handling 0x%02x type control frame\n",
+                            le16_to_cpu(hdr->type));
                 break;
         }
         return 0;