carl9170: Convert 'ar9170_qmap' to inline function

'ar9170_qmap' is used in some source files which include carl9170.h,
but not all of them.  A 'defined but not used' warning is thrown when
compiling the ones which do not use it.

Fixes the following W=1 kernel build warning(s)

 from drivers/net/wireless/ath/carl9170/carl9170.h:57,
 In file included from drivers/net/wireless/ath/carl9170/carl9170.h:57,
 drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]

 NB: Snipped - lots of these repeat

Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Suggested-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200827093351.GA1627017@dell

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 237d0cda1bcb053b40f994a9cbfcee51db3347ab..0d38100d6e4f561465c2b7e805480c3dbe411e19 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -68,7 +68,10 @@
 
 #define PAYLOAD_MAX    (CARL9170_MAX_CMD_LEN / 4 - 1)
 
-static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = { 3, 2, 1, 0 };
+static inline u8 ar9170_qmap(u8 idx)
+{
+       return 3 - idx; /* { 3, 2, 1, 0 } */
+}
 
 #define CARL9170_MAX_RX_BUFFER_SIZE            8192
 

diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 816929fb5b1437051c6eaf2b123530bb96343da1..dbef9d8fc893b7350bccfd7b5b34fbdbf99ac9f5 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1374,7 +1374,7 @@ static int carl9170_op_conf_tx(struct ieee80211_hw *hw,
        int ret;
 
        mutex_lock(&ar->mutex);
-       memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param));
+       memcpy(&ar->edcf[ar9170_qmap(queue)], param, sizeof(*param));
        ret = carl9170_set_qos(ar);
        mutex_unlock(&ar->mutex);
        return ret;

diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 8f896e1a6ad695a94f1f2c04955da86e9ee24ea4..235cf77cd60c5bb170b8c9969c3517b05948dfc7 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -663,7 +663,7 @@ static void __carl9170_tx_process_status(struct ar9170 *ar,
        unsigned int r, t, q;
        bool success = true;
 
-       q = ar9170_qmap[info & CARL9170_TX_STATUS_QUEUE];
+       q = ar9170_qmap(info & CARL9170_TX_STATUS_QUEUE);
 
        skb = carl9170_get_queued_skb(ar, cookie, &ar->tx_status[q]);
        if (!skb) {
@@ -979,7 +979,7 @@ static int carl9170_tx_prepare(struct ar9170 *ar,
                ((CARL9170_TX_SUPER_MISC_VIF_ID >>
                 CARL9170_TX_SUPER_MISC_VIF_ID_S) + 1));
 
-       hw_queue = ar9170_qmap[carl9170_get_queue(ar, skb)];
+       hw_queue = ar9170_qmap(carl9170_get_queue(ar, skb));
 
        hdr = (void *)skb->data;
        info = IEEE80211_SKB_CB(skb);
@@ -1279,7 +1279,7 @@ void carl9170_tx_drop(struct ar9170 *ar, struct sk_buff *skb)
 
        super = (void *)skb->data;
        SET_VAL(CARL9170_TX_SUPER_MISC_QUEUE, q,
-               ar9170_qmap[carl9170_get_queue(ar, skb)]);
+               ar9170_qmap(carl9170_get_queue(ar, skb)));
        __carl9170_tx_process_status(ar, super->s.cookie, q);
 }