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
@@ -84,7 +84,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
|
||||
}
|
||||
|
||||
if (i == 200)
|
||||
ERROR(rt2x00dev, "MCU request failed, no response from hardware\n");
|
||||
rt2x00_err(rt2x00dev, "MCU request failed, no response from hardware\n");
|
||||
|
||||
rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
|
||||
rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
|
||||
@@ -616,8 +616,8 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
|
||||
}
|
||||
|
||||
if (unlikely(retval))
|
||||
ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
|
||||
state, retval);
|
||||
rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
|
||||
state, retval);
|
||||
|
||||
return retval;
|
||||
}
|
||||
@@ -843,8 +843,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
|
||||
* Unknown queue, this shouldn't happen. Just drop
|
||||
* this tx status.
|
||||
*/
|
||||
WARNING(rt2x00dev, "Got TX status report with "
|
||||
"unexpected pid %u, dropping\n", qid);
|
||||
rt2x00_warn(rt2x00dev, "Got TX status report with unexpected pid %u, dropping\n",
|
||||
qid);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -854,8 +854,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
|
||||
* The queue is NULL, this shouldn't happen. Stop
|
||||
* processing here and drop the tx status
|
||||
*/
|
||||
WARNING(rt2x00dev, "Got TX status for an unavailable "
|
||||
"queue %u, dropping\n", qid);
|
||||
rt2x00_warn(rt2x00dev, "Got TX status for an unavailable queue %u, dropping\n",
|
||||
qid);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -864,8 +864,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
|
||||
* The queue is empty. Stop processing here
|
||||
* and drop the tx status.
|
||||
*/
|
||||
WARNING(rt2x00dev, "Got TX status for an empty "
|
||||
"queue %u, dropping\n", qid);
|
||||
rt2x00_warn(rt2x00dev, "Got TX status for an empty queue %u, dropping\n",
|
||||
qid);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -883,9 +883,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
|
||||
if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
|
||||
Q_INDEX, &status,
|
||||
rt2800pci_txdone_match_first)) {
|
||||
WARNING(rt2x00dev, "No frame found for TX "
|
||||
"status on queue %u, dropping\n",
|
||||
qid);
|
||||
rt2x00_warn(rt2x00dev, "No frame found for TX status on queue %u, dropping\n",
|
||||
qid);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1022,8 +1021,7 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
|
||||
break;
|
||||
|
||||
if (!kfifo_put(&rt2x00dev->txstatus_fifo, &status)) {
|
||||
WARNING(rt2x00dev, "TX status FIFO overrun,"
|
||||
"drop tx status report.\n");
|
||||
rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user