openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Neil Munro 2010-07-18 23:09:37 +01:00 committed by Greg Kroah-Hartman
parent e3eb7cdd11
commit e7d122b55d
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/rt2860/chlist.h
View File

@ -73,35 +73,31 @@ struct rt_ch_freq_map {
extern struct rt_ch_freq_map CH_HZ_ID_MAP[]; extern struct rt_ch_freq_map CH_HZ_ID_MAP[];
extern int CH_HZ_ID_MAP_NUM; extern int CH_HZ_ID_MAP_NUM;
#define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \ #define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \
do{ \ do { \
int _chIdx; \ int _chIdx; \
for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++)\ for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++) {\
{ \ if ((_ch) == CH_HZ_ID_MAP[_chIdx].channel) { \
if ((_ch) == CH_HZ_ID_MAP[_chIdx].channel) \ (_khz) = CH_HZ_ID_MAP[_chIdx].freqKHz * 1000;\
{ \ break; \
(_khz) = CH_HZ_ID_MAP[_chIdx].freqKHz * 1000; \ } \
break; \ } \
} \ if (_chIdx == CH_HZ_ID_MAP_NUM) \
} \ (_khz) = 2412000; \
if (_chIdx == CH_HZ_ID_MAP_NUM) \ } while (0)
(_khz) = 2412000; \
}while(0)
#define MAP_KHZ_TO_CHANNEL_ID(_khz, _ch) \ #define MAP_KHZ_TO_CHANNEL_ID(_khz, _ch) \
do{ \ do { \
int _chIdx; \ int _chIdx; \
for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++)\ for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++) {\
{ \ if ((_khz) == CH_HZ_ID_MAP[_chIdx].freqKHz) {\
if ((_khz) == CH_HZ_ID_MAP[_chIdx].freqKHz) \ (_ch) = CH_HZ_ID_MAP[_chIdx].channel; \
{ \ break; \
(_ch) = CH_HZ_ID_MAP[_chIdx].channel; \ } \
break; \ } \
} \ if (_chIdx == CH_HZ_ID_MAP_NUM) \
} \ (_ch) = 1; \
if (_chIdx == CH_HZ_ID_MAP_NUM) \ } while (0)
(_ch) = 1; \
}while(0)
void BuildChannelListEx(struct rt_rtmp_adapter *pAd); void BuildChannelListEx(struct rt_rtmp_adapter *pAd);