staging: r8188eu: remove HW_VAR_ACK_PREAMBLE from SetHwReg8188EU()

Remove the HW_VAR_ACK_PREAMBLE case from SetHwReg8188EU() and move
its functionality to rtw_wlan_util.c where it is actually used. This
is part of the ongoing effort to get rid of the unwanted hal layer.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220402092332.6627-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index f005bd3..acc5546 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -1304,26 +1304,36 @@ void update_IOT_info(struct adapter *padapter)
        }
 }
 
+static void set_ack_preamble(struct adapter *adapter, bool short_preamble)
+{
+       struct hal_data_8188e *haldata = &adapter->haldata;
+       u8 val8;
+
+       /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
+       val8 = haldata->nCur40MhzPrimeSC << 5;
+       if (short_preamble)
+               val8 |= 0x80;
+
+       rtw_write8(adapter, REG_RRSR + 2, val8);
+};
+
 void update_capinfo(struct adapter *Adapter, u16 updateCap)
 {
        struct mlme_ext_priv    *pmlmeext = &Adapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &pmlmeext->mlmext_info;
-       bool            ShortPreamble;
 
        /*  Check preamble mode, 2005.01.06, by rcnjko. */
        /*  Mark to update preamble value forever, 2008.03.18 by lanhsin */
 
        if (updateCap & cShortPreamble) { /*  Short Preamble */
                if (pmlmeinfo->preamble_mode != PREAMBLE_SHORT) { /*  PREAMBLE_LONG or PREAMBLE_AUTO */
-                       ShortPreamble = true;
                        pmlmeinfo->preamble_mode = PREAMBLE_SHORT;
-                       SetHwReg8188EU(Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble);
+                       set_ack_preamble(Adapter, true);
                }
        } else { /*  Long Preamble */
                if (pmlmeinfo->preamble_mode != PREAMBLE_LONG) {  /*  PREAMBLE_SHORT or PREAMBLE_AUTO */
-                       ShortPreamble = false;
                        pmlmeinfo->preamble_mode = PREAMBLE_LONG;
-                       SetHwReg8188EU(Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble);
+                       set_ack_preamble(Adapter, false);
                }
        }
 

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index cf34645..9326a60 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1094,18 +1094,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        }
                }
                break;
-       case HW_VAR_ACK_PREAMBLE:
-               {
-                       u8 regTmp;
-                       u8 bShortPreamble = *((bool *)val);
-                       /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
-                       regTmp = (haldata->nCur40MhzPrimeSC) << 5;
-                       if (bShortPreamble)
-                               regTmp |= 0x80;
-
-                       rtw_write8(Adapter, REG_RRSR + 2, regTmp);
-               }
-               break;
        case HW_VAR_DM_FLAG:
                podmpriv->SupportAbility = *((u8 *)val);
                break;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 591322c..c2b97fa 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -15,7 +15,6 @@ enum hw_variables {
        HW_VAR_MLME_SITESURVEY,
        HW_VAR_MLME_JOIN,
        HW_VAR_SLOT_TIME,
-       HW_VAR_ACK_PREAMBLE,
        HW_VAR_DM_FLAG,
        HW_VAR_DM_FUNC_OP,
        HW_VAR_DM_FUNC_RESET,