rt2x00: Gather channel information in structure

Channel information which is read from EEPROM should
be read into an array containing per-channel information.
This removes the requirement of multiple arrays and makes
the channel handling a bit cleaner and easier to expand.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h
index 91e04d319d76..868386c457f6 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.h
+++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -1050,17 +1050,10 @@ struct hw_pairwise_ta_entry {
 #define MAX_TXPOWER     31
 #define DEFAULT_TXPOWER 24
 
-#define TXPOWER_FROM_DEV(__txpower)             \
-({                                              \
-        ((__txpower) > MAX_TXPOWER) ?           \
-                DEFAULT_TXPOWER : (__txpower);  \
-})
-
-#define TXPOWER_TO_DEV(__txpower)                       \
-({                                                      \
-        ((__txpower) <= MIN_TXPOWER) ? MIN_TXPOWER :    \
-        (((__txpower) >= MAX_TXPOWER) ? MAX_TXPOWER :   \
-        (__txpower));                                   \
-})
+#define TXPOWER_FROM_DEV(__txpower) \
+        (((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
+
+#define TXPOWER_TO_DEV(__txpower) \
+        clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
 
 #endif /* RT73USB_H */