From f71fb77c29c83ef22ebd07fffd0581f2bec69b62 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Sat, 11 Apr 2009 23:03:04 +0400 Subject: Staging: stlc45xx: replace print_mac with %pM Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman --- drivers/staging/stlc45xx/stlc45xx.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/stlc45xx/stlc45xx.c b/drivers/staging/stlc45xx/stlc45xx.c index 3eced5520c5..cfdaac9b747 100644 --- a/drivers/staging/stlc45xx/stlc45xx.c +++ b/drivers/staging/stlc45xx/stlc45xx.c @@ -1787,7 +1787,6 @@ static int stlc45xx_tx_pspoll(struct stlc45xx *stlc, bool powersave) int payload_len, padding, i; struct s_lm_data_out *data; struct txbuffer *entry; - DECLARE_MAC_BUF(mac); struct sk_buff *skb; char *payload; u16 fc; @@ -1813,8 +1812,8 @@ static int stlc45xx_tx_pspoll(struct stlc45xx *stlc, bool powersave) memcpy(pspoll->addr1, stlc->bssid, ETH_ALEN); memcpy(pspoll->addr2, stlc->mac_addr, ETH_ALEN); - stlc45xx_debug(DEBUG_PSM, "sending PS-Poll frame to %s (powersave %d, " - "fc 0x%x, aid %d)", print_mac(mac, pspoll->addr1), + stlc45xx_debug(DEBUG_PSM, "sending PS-Poll frame to %pM (powersave %d, " + "fc 0x%x, aid %d)", pspoll->addr1, powersave, fc, stlc->aid); spin_lock_bh(&stlc->tx_lock); @@ -1903,7 +1902,6 @@ static int stlc45xx_tx_nullfunc(struct stlc45xx *stlc, bool powersave) int payload_len, padding, i; struct s_lm_data_out *data; struct txbuffer *entry; - DECLARE_MAC_BUF(mac); struct sk_buff *skb; char *payload; u16 fc; @@ -1928,9 +1926,8 @@ static int stlc45xx_tx_nullfunc(struct stlc45xx *stlc, bool powersave) memcpy(nullfunc->addr2, stlc->mac_addr, ETH_ALEN); memcpy(nullfunc->addr3, stlc->bssid, ETH_ALEN); - stlc45xx_debug(DEBUG_PSM, "sending Null frame to %s (powersave %d, " - "fc 0x%x)", - print_mac(mac, nullfunc->addr1), powersave, fc); + stlc45xx_debug(DEBUG_PSM, "sending Null frame to %pM (powersave %d, " + "fc 0x%x)", nullfunc->addr1, powersave, fc); spin_lock_bh(&stlc->tx_lock); -- cgit v1.2.3