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>

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 5192ef70bcfcd415fc0023f39029a561f2d358b7..84ffc01030e039776eaf98b35428f7acfc4b75bc 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -210,13 +210,6 @@ static void phy_set_bw_mode_callback(struct adapter *adapt)
        u8 reg_bw_opmode;
        u8 reg_prsr_rsc;
 
-       if (hal_data->rf_chip == RF_PSEUDO_11N)
-               return;
-
-       /*  There is no 40MHz mode in RF_8225. */
-       if (hal_data->rf_chip == RF_8225)
-               return;
-
        if (adapt->bDriverStopped)
                return;
 
@@ -265,8 +258,7 @@ static void phy_set_bw_mode_callback(struct adapter *adapt)
        }
 
        /* Set RF related register */
-       if (hal_data->rf_chip == RF_6052)
-               rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW);
+       rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW);
 }
 
 void rtw_hal_set_bwmode(struct adapter *adapt, enum ht_channel_width bandwidth,
@@ -307,9 +299,6 @@ void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
        struct hal_data_8188e *hal_data = adapt->HalData;
        u8 tmpchannel = hal_data->CurrentChannel;
 
-       if (hal_data->rf_chip == RF_PSEUDO_11N)
-               return;
-
        if (channel == 0)
                channel = 1;
 

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 87e379e6d6adc00f8f625d50309ba4f4881769c3..71d6ade70554aa14a579029e431312e9cd7973e1 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1096,18 +1096,12 @@ static void _ReadPROMContent(
        readAdapterInfo_8188EU(Adapter);
 }
 
-static void _ReadRFType(struct adapter *Adapter)
-{
-       Adapter->HalData->rf_chip = RF_6052;
-}
-
 void rtw_hal_read_chip_info(struct adapter *Adapter)
 {
        unsigned long start = jiffies;
 
        MSG_88E("====> %s\n", __func__);
 
-       _ReadRFType(Adapter);/* rf_chip -> _InitRFType() */
        _ReadPROMContent(Adapter);
 
        MSG_88E("<==== %s in %d ms\n", __func__,

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index 53c975ac1506a40787684a7bdd1c9247e3a22594..226e89ba132de074555d9faef334b9a6d75512d4 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -201,7 +201,6 @@ struct hal_data_8188e {
        u16     BasicRateSet;
 
        /* rf_ctrl */
-       u8      rf_chip;
        u8      NumTotalRFPath;
 
        u8      BoardType;