Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: vt6656: rf.c: RFbRFTableDownload: Remove camel case and clean up.

White space clean up.

Camel case changes;
pDevice -> priv
wLength1 -> length1
wLength2 -> length2
wLength3 -> length3
pbyAddr1 -> addr1
pbyAddr2 -> addr2
pbyAddr3 -> addr3
wLength -> length
wValue -> value
abyArray -> array

No functional changes.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Malcolm Priestley and committed by
Greg Kroah-Hartman
d9652aef ecb6ecbb

+110 -129
+110 -129
drivers/staging/vt6656/rf.c
··· 966 966 *dbm = -1 * (a + b * 2); 967 967 } 968 968 969 - void RFbRFTableDownload(struct vnt_private *pDevice) 969 + void RFbRFTableDownload(struct vnt_private *priv) 970 970 { 971 - u16 wLength1 = 0, wLength2 = 0, wLength3 = 0; 972 - u8 *pbyAddr1 = NULL, *pbyAddr2 = NULL, *pbyAddr3 = NULL; 973 - u16 wLength, wValue; 974 - u8 abyArray[256]; 971 + u16 length1 = 0, length2 = 0, length3 = 0; 972 + u8 *addr1 = NULL, *addr2 = NULL, *addr3 = NULL; 973 + u16 length, value; 974 + u8 array[256]; 975 975 976 - switch ( pDevice->byRFType ) { 977 - case RF_AL2230: 978 - case RF_AL2230S: 979 - wLength1 = CB_AL2230_INIT_SEQ * 3; 980 - wLength2 = CB_MAX_CHANNEL_24G * 3; 981 - wLength3 = CB_MAX_CHANNEL_24G * 3; 982 - pbyAddr1 = &(abyAL2230InitTable[0][0]); 983 - pbyAddr2 = &(abyAL2230ChannelTable0[0][0]); 984 - pbyAddr3 = &(abyAL2230ChannelTable1[0][0]); 985 - break; 986 - case RF_AIROHA7230: 987 - wLength1 = CB_AL7230_INIT_SEQ * 3; 988 - wLength2 = CB_MAX_CHANNEL * 3; 989 - wLength3 = CB_MAX_CHANNEL * 3; 990 - pbyAddr1 = &(abyAL7230InitTable[0][0]); 991 - pbyAddr2 = &(abyAL7230ChannelTable0[0][0]); 992 - pbyAddr3 = &(abyAL7230ChannelTable1[0][0]); 993 - break; 994 - case RF_VT3226: //RobertYu:20051111 995 - wLength1 = CB_VT3226_INIT_SEQ * 3; 996 - wLength2 = CB_MAX_CHANNEL_24G * 3; 997 - wLength3 = CB_MAX_CHANNEL_24G * 3; 998 - pbyAddr1 = &(abyVT3226_InitTable[0][0]); 999 - pbyAddr2 = &(abyVT3226_ChannelTable0[0][0]); 1000 - pbyAddr3 = &(abyVT3226_ChannelTable1[0][0]); 1001 - break; 1002 - case RF_VT3226D0: //RobertYu:20051114 1003 - wLength1 = CB_VT3226_INIT_SEQ * 3; 1004 - wLength2 = CB_MAX_CHANNEL_24G * 3; 1005 - wLength3 = CB_MAX_CHANNEL_24G * 3; 1006 - pbyAddr1 = &(abyVT3226D0_InitTable[0][0]); 1007 - pbyAddr2 = &(abyVT3226_ChannelTable0[0][0]); 1008 - pbyAddr3 = &(abyVT3226_ChannelTable1[0][0]); 1009 - break; 1010 - case RF_VT3342A0: //RobertYu:20060609 1011 - wLength1 = CB_VT3342_INIT_SEQ * 3; 1012 - wLength2 = CB_MAX_CHANNEL * 3; 1013 - wLength3 = CB_MAX_CHANNEL * 3; 1014 - pbyAddr1 = &(abyVT3342A0_InitTable[0][0]); 1015 - pbyAddr2 = &(abyVT3342_ChannelTable0[0][0]); 1016 - pbyAddr3 = &(abyVT3342_ChannelTable1[0][0]); 1017 - break; 976 + switch (priv->byRFType) { 977 + case RF_AL2230: 978 + case RF_AL2230S: 979 + length1 = CB_AL2230_INIT_SEQ * 3; 980 + length2 = CB_MAX_CHANNEL_24G * 3; 981 + length3 = CB_MAX_CHANNEL_24G * 3; 982 + addr1 = &abyAL2230InitTable[0][0]; 983 + addr2 = &abyAL2230ChannelTable0[0][0]; 984 + addr3 = &abyAL2230ChannelTable1[0][0]; 985 + break; 986 + case RF_AIROHA7230: 987 + length1 = CB_AL7230_INIT_SEQ * 3; 988 + length2 = CB_MAX_CHANNEL * 3; 989 + length3 = CB_MAX_CHANNEL * 3; 990 + addr1 = &abyAL7230InitTable[0][0]; 991 + addr2 = &abyAL7230ChannelTable0[0][0]; 992 + addr3 = &abyAL7230ChannelTable1[0][0]; 993 + break; 994 + case RF_VT3226: 995 + length1 = CB_VT3226_INIT_SEQ * 3; 996 + length2 = CB_MAX_CHANNEL_24G * 3; 997 + length3 = CB_MAX_CHANNEL_24G * 3; 998 + addr1 = &abyVT3226_InitTable[0][0]; 999 + addr2 = &abyVT3226_ChannelTable0[0][0]; 1000 + addr3 = &abyVT3226_ChannelTable1[0][0]; 1001 + break; 1002 + case RF_VT3226D0: 1003 + length1 = CB_VT3226_INIT_SEQ * 3; 1004 + length2 = CB_MAX_CHANNEL_24G * 3; 1005 + length3 = CB_MAX_CHANNEL_24G * 3; 1006 + addr1 = &abyVT3226D0_InitTable[0][0]; 1007 + addr2 = &abyVT3226_ChannelTable0[0][0]; 1008 + addr3 = &abyVT3226_ChannelTable1[0][0]; 1009 + break; 1010 + case RF_VT3342A0: 1011 + length1 = CB_VT3342_INIT_SEQ * 3; 1012 + length2 = CB_MAX_CHANNEL * 3; 1013 + length3 = CB_MAX_CHANNEL * 3; 1014 + addr1 = &abyVT3342A0_InitTable[0][0]; 1015 + addr2 = &abyVT3342_ChannelTable0[0][0]; 1016 + addr3 = &abyVT3342_ChannelTable1[0][0]; 1017 + break; 1018 + } 1018 1019 1019 - } 1020 - //Init Table 1020 + /* Init Table */ 1021 + memcpy(array, addr1, length1); 1021 1022 1022 - memcpy(abyArray, pbyAddr1, wLength1); 1023 - CONTROLnsRequestOut(pDevice, 1024 - MESSAGE_TYPE_WRITE, 1025 - 0, 1026 - MESSAGE_REQUEST_RF_INIT, 1027 - wLength1, 1028 - abyArray 1029 - ); 1030 - //Channel Table 0 1031 - wValue = 0; 1032 - while ( wLength2 > 0 ) { 1023 + CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 0, 1024 + MESSAGE_REQUEST_RF_INIT, length1, array); 1033 1025 1034 - if ( wLength2 >= 64 ) { 1035 - wLength = 64; 1036 - } else { 1037 - wLength = wLength2; 1038 - } 1039 - memcpy(abyArray, pbyAddr2, wLength); 1040 - CONTROLnsRequestOut(pDevice, 1041 - MESSAGE_TYPE_WRITE, 1042 - wValue, 1043 - MESSAGE_REQUEST_RF_CH0, 1044 - wLength, 1045 - abyArray); 1026 + /* Channel Table 0 */ 1027 + value = 0; 1028 + while (length2 > 0) { 1029 + if (length2 >= 64) 1030 + length = 64; 1031 + else 1032 + length = length2; 1046 1033 1047 - wLength2 -= wLength; 1048 - wValue += wLength; 1049 - pbyAddr2 += wLength; 1050 - } 1051 - //Channel table 1 1052 - wValue = 0; 1053 - while ( wLength3 > 0 ) { 1034 + memcpy(array, addr2, length); 1054 1035 1055 - if ( wLength3 >= 64 ) { 1056 - wLength = 64; 1057 - } else { 1058 - wLength = wLength3; 1059 - } 1060 - memcpy(abyArray, pbyAddr3, wLength); 1061 - CONTROLnsRequestOut(pDevice, 1062 - MESSAGE_TYPE_WRITE, 1063 - wValue, 1064 - MESSAGE_REQUEST_RF_CH1, 1065 - wLength, 1066 - abyArray); 1036 + CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 1037 + value, MESSAGE_REQUEST_RF_CH0, length, array); 1067 1038 1068 - wLength3 -= wLength; 1069 - wValue += wLength; 1070 - pbyAddr3 += wLength; 1071 - } 1039 + length2 -= length; 1040 + value += length; 1041 + addr2 += length; 1042 + } 1072 1043 1073 - //7230 needs 2 InitTable and 3 Channel Table 1074 - if ( pDevice->byRFType == RF_AIROHA7230 ) { 1075 - wLength1 = CB_AL7230_INIT_SEQ * 3; 1076 - wLength2 = CB_MAX_CHANNEL * 3; 1077 - pbyAddr1 = &(abyAL7230InitTableAMode[0][0]); 1078 - pbyAddr2 = &(abyAL7230ChannelTable2[0][0]); 1079 - memcpy(abyArray, pbyAddr1, wLength1); 1080 - //Init Table 2 1081 - CONTROLnsRequestOut(pDevice, 1082 - MESSAGE_TYPE_WRITE, 1083 - 0, 1084 - MESSAGE_REQUEST_RF_INIT2, 1085 - wLength1, 1086 - abyArray); 1044 + /* Channel table 1 */ 1045 + value = 0; 1046 + while (length3 > 0) { 1047 + if (length3 >= 64) 1048 + length = 64; 1049 + else 1050 + length = length3; 1087 1051 1088 - //Channel Table 0 1089 - wValue = 0; 1090 - while ( wLength2 > 0 ) { 1052 + memcpy(array, addr3, length); 1091 1053 1092 - if ( wLength2 >= 64 ) { 1093 - wLength = 64; 1094 - } else { 1095 - wLength = wLength2; 1096 - } 1097 - memcpy(abyArray, pbyAddr2, wLength); 1098 - CONTROLnsRequestOut(pDevice, 1099 - MESSAGE_TYPE_WRITE, 1100 - wValue, 1101 - MESSAGE_REQUEST_RF_CH2, 1102 - wLength, 1103 - abyArray); 1054 + CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 1055 + value, MESSAGE_REQUEST_RF_CH1, length, array); 1104 1056 1105 - wLength2 -= wLength; 1106 - wValue += wLength; 1107 - pbyAddr2 += wLength; 1108 - } 1109 - } 1057 + length3 -= length; 1058 + value += length; 1059 + addr3 += length; 1060 + } 1110 1061 1062 + if (priv->byRFType == RF_AIROHA7230) { 1063 + length1 = CB_AL7230_INIT_SEQ * 3; 1064 + length2 = CB_MAX_CHANNEL * 3; 1065 + addr1 = &(abyAL7230InitTableAMode[0][0]); 1066 + addr2 = &(abyAL7230ChannelTable2[0][0]); 1067 + 1068 + memcpy(array, addr1, length1); 1069 + 1070 + /* Init Table 2 */ 1071 + CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 1072 + 0, MESSAGE_REQUEST_RF_INIT2, length1, array); 1073 + 1074 + /* Channel Table 0 */ 1075 + value = 0; 1076 + while (length2 > 0) { 1077 + if (length2 >= 64) 1078 + length = 64; 1079 + else 1080 + length = length2; 1081 + 1082 + memcpy(array, addr2, length); 1083 + 1084 + CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 1085 + value, MESSAGE_REQUEST_RF_CH2, length, array); 1086 + 1087 + length2 -= length; 1088 + value += length; 1089 + addr2 += length; 1090 + } 1091 + } 1111 1092 }