lkml.org 
[lkml]   [2016]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/34] staging:r8188eu: remove rf_chip member of hal_data_8188e structure
    Date
    This member is constant.

    Signed-off-by: Ivan Safonov <insafonov@gmail.com>
    ---
    drivers/staging/rtl8188eu/hal/phy.c | 13 +------------
    drivers/staging/rtl8188eu/hal/usb_halinit.c | 6 ------
    drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 -
    3 files changed, 1 insertion(+), 19 deletions(-)

    diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
    index 5192ef7..84ffc01 100644
    --- 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 87e379e..71d6ade 100644
    --- 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 53c975a..226e89b 100644
    --- 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;
    --
    2.7.3
    \
     
     \ /
      Last update: 2016-10-07 20:18    [W:4.141 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site