ath5k: fix build break from "ath5k: Print out opmode in debugfs"

Also improve ath_opmode_to_string usage by having it return UNKNOWN
rather than NULL in the event of failure to map the opmode value to a
representative string.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 13 insertions, 16 deletions

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index c9732a6ce87f..7baaf04f092d 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -563,9 +563,7 @@ static void ath_do_set_opmode(struct ath5k_softc *sc)
         struct ath5k_hw *ah = sc->ah;
         ath5k_hw_set_opmode(ah, sc->opmode);
         ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "mode setup opmode %d (%s)\n",
-                  sc->opmode,
-                  ath_opmode_to_string(sc->opmode) ?
-                  ath_opmode_to_string(sc->opmode) : "UKNOWN");
+                  sc->opmode, ath_opmode_to_string(sc->opmode));
 }
 
 void ath5k_update_bssid_mask_and_opmode(struct ath5k_softc *sc,
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index a3b217125331..7c77e5b7c9af 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -493,7 +493,6 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
         char buf[700];
         unsigned int len = 0;
         u32 filt = ath5k_hw_get_rx_filter(sc->ah);
-        const char *tmp;
 
         len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
                         sc->bssidmask);
@@ -522,17 +521,10 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
         if (filt & AR5K_RX_FILTER_PHYERR_5211)
                 snprintf(buf+len, sizeof(buf)-len, " PHYERR-5211");
         if (filt & AR5K_RX_FILTER_RADARERR_5211)
-                len += snprintf(buf+len, sizeof(buf)-len, " RADARERR-5211\n");
-        else
-                len += snprintf(buf+len, sizeof(buf)-len, "\n");
-
-        tmp = ath_opmode_to_string(sc->opmode);
-        if (tmp)
-                len += snprintf(buf+len, sizeof(buf)-len, "opmode: %s\n",
-                                tmp);
-        else
-                len += snprintf(buf+len, sizeof(buf)-len,
-                                "opmode: UNKNOWN-%i\n", sc->opmode);
+                len += snprintf(buf+len, sizeof(buf)-len, " RADARERR-5211");
+
+        len += snprintf(buf+len, sizeof(buf)-len, "\nopmode: %s (%d)\n",
+                        ath_opmode_to_string(sc->opmode), sc->opmode);
 
         if (len > sizeof(buf))
                 len = sizeof(buf);
diff --git a/drivers/net/wireless/ath/debug.c b/drivers/net/wireless/ath/debug.c
index a9eb7876dbe1..dacfb234f491 100644
--- a/drivers/net/wireless/ath/debug.c
+++ b/drivers/net/wireless/ath/debug.c
@@ -55,7 +55,7 @@ const char *ath_opmode_to_string(enum nl80211_iftype opmode)
         case NL80211_IFTYPE_P2P_GO:
                 return "P2P-GO";
         default:
-                return NULL;
+                return "UNKNOWN";
         }
 }
 EXPORT_SYMBOL(ath_opmode_to_string);
diff --git a/drivers/net/wireless/ath/debug.h b/drivers/net/wireless/ath/debug.h
index a3a5a628d24d..64e4af2c2887 100644
--- a/drivers/net/wireless/ath/debug.h
+++ b/drivers/net/wireless/ath/debug.h
@@ -78,6 +78,13 @@ ath_print(struct ath_common *common, int dbg_mask, const char *fmt, ...)
 #endif /* CONFIG_ATH_DEBUG */
 
 /** Returns string describing opmode, or NULL if unknown mode. */
+#ifdef CONFIG_ATH_DEBUG
 const char *ath_opmode_to_string(enum nl80211_iftype opmode);
+#else
+static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
+{
+        return "UNKNOWN";
+}
+#endif
 
 #endif /* ATH_DEBUG_H */