Signed off by Jack Livingood <jacklivingood@xxxxxxxxxxx> --- drivers/net/wireless/intel/iwlwifi/iwl-io.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c index cd7eebe6a7b1..957000d5df68 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c @@ -230,15 +230,19 @@ IWL_EXPORT_SYMBOL(iwl_force_nmi); static const char *get_rfh_string(int cmd) { #define IWL_CMD(x) case x: return #x -#define IWL_CMD_MQ(arg, reg, q) { if (arg == reg(q)) return #reg; } + int i; for (i = 0; i < IWL_MAX_RX_HW_QUEUES; i++) { - IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_BA_LSB, i); - IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_WIDX, i); - IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_RIDX, i); - IWL_CMD_MQ(cmd, RFH_Q_URBD_STTS_WPTR_LSB, i); + if (cmd == RFH_Q_FRBDCB_BA_LSB(i)) + return #RFH_Q_FRBDCB_BA_LSB; + if (cmd == RFH_Q_FRBDCB_WIDX(i)) + return #RFH_Q_FRBDCB_WIDX; + if (cmd == RFH_Q_FRBDCB_RIDX(i)) + return #RFH_Q_FRBDCB_RIDX; + if (cmd == _Q_URBD_STTS_WPTR_LSB(i)) + return #RFH_Q_URBD_STTS_WPTR_LSB; } switch (cmd) { -- 2.48.1