diff options
author | Neil Munro <neilmunro@gmail.com> | 2010-07-18 18:09:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 17:33:00 -0400 |
commit | e7d122b55d6031c748a9f264c1f6f28f948852a2 (patch) | |
tree | 3c136b2ffa04c557e620fa25e8f3884f75ed7a08 /drivers/staging/rt2860 | |
parent | e3eb7cdd111eec56d201c4a2b20b743c746b6d99 (diff) |
Staging: RT2860: Cleaned all bar one in chlist.h
I have cleaned all errors and all bar one warning in chlist.h. The
remaining warning is a line over 80 characters warning. Breaking it
doesnt look all that easy.
Signed-off-by: Neil Munro <neilmunro@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r-- | drivers/staging/rt2860/chlist.h | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/drivers/staging/rt2860/chlist.h b/drivers/staging/rt2860/chlist.h index ada65e5ac61..1231e69d518 100644 --- a/drivers/staging/rt2860/chlist.h +++ b/drivers/staging/rt2860/chlist.h | |||
@@ -73,35 +73,31 @@ struct rt_ch_freq_map { | |||
73 | extern struct rt_ch_freq_map CH_HZ_ID_MAP[]; | 73 | extern struct rt_ch_freq_map CH_HZ_ID_MAP[]; |
74 | extern int CH_HZ_ID_MAP_NUM; | 74 | extern int CH_HZ_ID_MAP_NUM; |
75 | 75 | ||
76 | #define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \ | 76 | #define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \ |
77 | do{ \ | 77 | do { \ |
78 | int _chIdx; \ | 78 | int _chIdx; \ |
79 | for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++)\ | 79 | for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++) {\ |
80 | { \ | 80 | if ((_ch) == CH_HZ_ID_MAP[_chIdx].channel) { \ |
81 | if ((_ch) == CH_HZ_ID_MAP[_chIdx].channel) \ | 81 | (_khz) = CH_HZ_ID_MAP[_chIdx].freqKHz * 1000;\ |
82 | { \ | 82 | break; \ |
83 | (_khz) = CH_HZ_ID_MAP[_chIdx].freqKHz * 1000; \ | 83 | } \ |
84 | break; \ | 84 | } \ |
85 | } \ | 85 | if (_chIdx == CH_HZ_ID_MAP_NUM) \ |
86 | } \ | 86 | (_khz) = 2412000; \ |
87 | if (_chIdx == CH_HZ_ID_MAP_NUM) \ | 87 | } while (0) |
88 | (_khz) = 2412000; \ | ||
89 | }while(0) | ||
90 | 88 | ||
91 | #define MAP_KHZ_TO_CHANNEL_ID(_khz, _ch) \ | 89 | #define MAP_KHZ_TO_CHANNEL_ID(_khz, _ch) \ |
92 | do{ \ | 90 | do { \ |
93 | int _chIdx; \ | 91 | int _chIdx; \ |
94 | for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++)\ | 92 | for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++) {\ |
95 | { \ | 93 | if ((_khz) == CH_HZ_ID_MAP[_chIdx].freqKHz) {\ |
96 | if ((_khz) == CH_HZ_ID_MAP[_chIdx].freqKHz) \ | 94 | (_ch) = CH_HZ_ID_MAP[_chIdx].channel; \ |
97 | { \ | 95 | break; \ |
98 | (_ch) = CH_HZ_ID_MAP[_chIdx].channel; \ | 96 | } \ |
99 | break; \ | 97 | } \ |
100 | } \ | 98 | if (_chIdx == CH_HZ_ID_MAP_NUM) \ |
101 | } \ | 99 | (_ch) = 1; \ |
102 | if (_chIdx == CH_HZ_ID_MAP_NUM) \ | 100 | } while (0) |
103 | (_ch) = 1; \ | ||
104 | }while(0) | ||
105 | 101 | ||
106 | void BuildChannelListEx(struct rt_rtmp_adapter *pAd); | 102 | void BuildChannelListEx(struct rt_rtmp_adapter *pAd); |
107 | 103 | ||