Commit 515d3cf7 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove SetHalDefVarHandler from struct hal_ops 



Remove SetHalDefVarHandler from struct hal_ops and remove its wrapper
rtw_hal_set_def_var(). Call SetHalDefVar8188EUsb() directly instead.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210929192657.9569-2-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4943579

drivers/staging/r8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ void rtw_hal_get_hwreg(struct adapter *adapt, u8 variable, u8 *val) 
		adapt->HalFunc.GetHwRegHandler(adapt, variable, val);

}



u8 rtw_hal_set_def_var(struct adapter *adapt, enum hal_def_variable var,

		      void *val)

{

	if (adapt->HalFunc.SetHalDefVarHandler)

		return adapt->HalFunc.SetHalDefVarHandler(adapt, var, val);

	return _FAIL;

}



u8 rtw_hal_get_def_var(struct adapter *adapt,

		       enum hal_def_variable var, void *val)

{

drivers/staging/r8188eu/hal/usb_halinit.c

+2 −6
Original line number Diff line number Diff line
@@ -1956,11 +1956,8 @@ GetHalDefVar8188EUsb( 
	return bResult;

}



/*  */

/*	Description: */

/* Change default setting of specified variable. */

/*  */

static u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue)

u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue)

{

	struct hal_data_8188e	*haldata = GET_HAL_DATA(Adapter);

	u8 bResult = _SUCCESS;
@@ -2172,5 +2169,4 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->SetHwRegHandler = &SetHwReg8188EU;

	halfunc->GetHwRegHandler = &GetHwReg8188EU;

	halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;

	halfunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb;

}

drivers/staging/r8188eu/include/hal_intf.h

+2 −5
Original line number Diff line number Diff line
@@ -141,9 +141,6 @@ struct hal_ops { 
	u8	(*GetHalDefVarHandler)(struct adapter *padapter,

				       enum hal_def_variable eVariable,

				       void *pValue);

	u8	(*SetHalDefVarHandler)(struct adapter *padapter,

				       enum hal_def_variable eVariable,

				       void *pValue);

};



#define RF_CHANGE_BY_INIT	0
@@ -183,14 +180,14 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level); 
int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter,

				struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);



u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue);



uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_deinit(struct adapter *padapter);

void rtw_hal_stop(struct adapter *padapter);

void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val);

void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);



u8 rtw_hal_set_def_var(struct adapter *padapter,

		       enum hal_def_variable eVariable, void *pValue);

u8 rtw_hal_get_def_var(struct adapter *padapter,

		       enum hal_def_variable eVariable, void *pValue);

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+3 −3
Original line number Diff line number Diff line
@@ -3996,10 +3996,10 @@ static int rtw_dbg_port(struct net_device *dev, 
		case 0x0c:/* dump rx/tx packet */

			if (arg == 0) {

				DBG_88E("dump rx packet (%d)\n", extra_arg);

				rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_RXPKT, &(extra_arg));

				SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DUMP_RXPKT, &extra_arg);

			} else if (arg == 1) {

				DBG_88E("dump tx packet (%d)\n", extra_arg);

				rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(extra_arg));

				SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DUMP_TXPKT, &extra_arg);

			}

			break;

		case 0x0f:
@@ -4097,7 +4097,7 @@ static int rtw_dbg_port(struct net_device *dev, 
						extra_arg = 2  - disable tx power tracking

						extra_arg = 3  - turn on all dynamic func

					*/

					rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &(extra_arg));

					SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &extra_arg);

					rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &odm_flag);

					DBG_88E(" === DMFlag(0x%08x) ===\n", odm_flag);

				}