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

staging:r8188eu: remove rf_chip member of hal_data_8188e structure

This member is constant.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman
ffc2ab44 6f8f444d

+1 -19
+1 -12
drivers/staging/rtl8188eu/hal/phy.c
··· 210 210 u8 reg_bw_opmode; 211 211 u8 reg_prsr_rsc; 212 212 213 - if (hal_data->rf_chip == RF_PSEUDO_11N) 214 - return; 215 - 216 - /* There is no 40MHz mode in RF_8225. */ 217 - if (hal_data->rf_chip == RF_8225) 218 - return; 219 - 220 213 if (adapt->bDriverStopped) 221 214 return; 222 215 ··· 258 265 } 259 266 260 267 /* Set RF related register */ 261 - if (hal_data->rf_chip == RF_6052) 262 - rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW); 268 + rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW); 263 269 } 264 270 265 271 void rtw_hal_set_bwmode(struct adapter *adapt, enum ht_channel_width bandwidth, ··· 298 306 { 299 307 struct hal_data_8188e *hal_data = adapt->HalData; 300 308 u8 tmpchannel = hal_data->CurrentChannel; 301 - 302 - if (hal_data->rf_chip == RF_PSEUDO_11N) 303 - return; 304 309 305 310 if (channel == 0) 306 311 channel = 1;
-6
drivers/staging/rtl8188eu/hal/usb_halinit.c
··· 1096 1096 readAdapterInfo_8188EU(Adapter); 1097 1097 } 1098 1098 1099 - static void _ReadRFType(struct adapter *Adapter) 1100 - { 1101 - Adapter->HalData->rf_chip = RF_6052; 1102 - } 1103 - 1104 1099 void rtw_hal_read_chip_info(struct adapter *Adapter) 1105 1100 { 1106 1101 unsigned long start = jiffies; 1107 1102 1108 1103 MSG_88E("====> %s\n", __func__); 1109 1104 1110 - _ReadRFType(Adapter);/* rf_chip -> _InitRFType() */ 1111 1105 _ReadPROMContent(Adapter); 1112 1106 1113 1107 MSG_88E("<==== %s in %d ms\n", __func__,
-1
drivers/staging/rtl8188eu/include/rtl8188e_hal.h
··· 201 201 u16 BasicRateSet; 202 202 203 203 /* rf_ctrl */ 204 - u8 rf_chip; 205 204 u8 NumTotalRFPath; 206 205 207 206 u8 BoardType;