rt2x00: Use more current logging styles, shrink object size
Reduce object space ~2% using more current logging styles. Neaten and simplify logging macros. Use wiphy_<level> where appropriate. Coalesce formats. Convert ERROR/WARNING/INFO macros to rt2x00_<level> Convert EEPROM to rt2x00_eeprom_dbg Convert PROBE_ERROR to rt2x00_probe_err Convert DEBUG to rt2x00_dbg Convert EEPROM to rt2x00_eeprom_dbg $ size drivers/net/wireless/rt2x00/built-in.o* text data bss dec hex filename 245639 71696 69584 386919 5e767 drivers/net/wireless/rt2x00/built-in.o.new 240609 70096 68944 379649 5cb01 drivers/net/wireless/rt2x00/built-in.o.new.nodyndbg 240609 70096 68944 379649 5cb01 drivers/net/wireless/rt2x00/built-in.o.new.no_rt2x00_debug 249198 70096 70352 389646 5f20e drivers/net/wireless/rt2x00/built-in.o.old 249198 70096 70352 389646 5f20e drivers/net/wireless/rt2x00/built-in.o.old.nodyndbg 244222 70096 69712 384030 5dc1e drivers/net/wireless/rt2x00/built-in.o.old.no_rt2x00_debug Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
624708b85e
commit
ec9c498991
@@ -46,7 +46,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
|
||||
|
||||
skb = dev_alloc_skb(data_length + rt2x00dev->hw->extra_tx_headroom);
|
||||
if (unlikely(!skb)) {
|
||||
WARNING(rt2x00dev, "Failed to create RTS/CTS frame.\n");
|
||||
rt2x00_warn(rt2x00dev, "Failed to create RTS/CTS frame\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
|
||||
retval = rt2x00queue_write_tx_frame(queue, skb, true);
|
||||
if (retval) {
|
||||
dev_kfree_skb_any(skb);
|
||||
WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");
|
||||
rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
|
||||
}
|
||||
|
||||
return retval;
|
||||
@@ -126,9 +126,9 @@ void rt2x00mac_tx(struct ieee80211_hw *hw,
|
||||
|
||||
queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);
|
||||
if (unlikely(!queue)) {
|
||||
ERROR(rt2x00dev,
|
||||
"Attempt to send packet over invalid queue %d.\n"
|
||||
"Please file bug report to %s.\n", qid, DRV_PROJECT);
|
||||
rt2x00_err(rt2x00dev,
|
||||
"Attempt to send packet over invalid queue %d\n"
|
||||
"Please file bug report to %s\n", qid, DRV_PROJECT);
|
||||
goto exit_free_skb;
|
||||
}
|
||||
|
||||
@@ -731,9 +731,10 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
|
||||
queue->aifs = params->aifs;
|
||||
queue->txop = params->txop;
|
||||
|
||||
DEBUG(rt2x00dev,
|
||||
"Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
|
||||
queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
|
||||
rt2x00_dbg(rt2x00dev,
|
||||
"Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d\n",
|
||||
queue_idx, queue->cw_min, queue->cw_max, queue->aifs,
|
||||
queue->txop);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user