staging: r8188eu: remove HW_VAR_CAM_WRITE

Remove HW_VAR_CAM_WRITE from SetHwReg8188EU() and call rtw_write32()
directly.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220130190321.7172-10-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 a8acec776b799115ff94d11e1ae37e7034a5c501..c6288c2d5f332eb3fd28eb6f4cb09ba2eb5d5af7 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -456,7 +456,8 @@ void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
                cam_val[0] = val;
                cam_val[1] = addr + (unsigned int)j;
 
-               SetHwReg8188EU(padapter, HW_VAR_CAM_WRITE, (u8 *)cam_val);
+               rtw_write32(padapter, WCAMI, cam_val[0]);
+               rtw_write32(padapter, RWCAM, CAM_POLLINIG | CAM_WRITE | cam_val[1]);
        }
 }
 

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index db9a2a963a2a5e961d99ab7e6c8d3a1302e5fc3b..b92f56a8f35cb97b7555b98336db18448838294b 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1323,16 +1323,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        }
                }
                break;
-       case HW_VAR_CAM_WRITE:
-               {
-                       u32 cmd;
-                       u32 *cam_val = (u32 *)val;
-                       rtw_write32(Adapter, WCAMI, cam_val[0]);
-
-                       cmd = CAM_POLLINIG | CAM_WRITE | cam_val[1];
-                       rtw_write32(Adapter, RWCAM, cmd);
-               }
-               break;
        case HW_VAR_AC_PARAM_BE:
                haldata->AcParam_BE = ((u32 *)(val))[0];
                rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]);

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 7c04cabc6def4d6eba473e6633303003c69fc492..31159265085b4276ee3705cb4ba15fd26967ecb3 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -28,7 +28,6 @@ enum hw_variables {
        HW_VAR_DM_FUNC_SET,
        HW_VAR_DM_FUNC_CLR,
        HW_VAR_CAM_EMPTY_ENTRY,
-       HW_VAR_CAM_WRITE,
        HW_VAR_CAM_READ,
        HW_VAR_AC_PARAM_BE,
        HW_VAR_ACM_CTRL,