Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90c69b7a authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove UpdateRAMaskHandler member of hal_ops structure 



It is unnecessary wrapper for UpdateHalRAMask8188EUsb function.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e1e385a

drivers/staging/rtl8188eu/hal/hal_intf.c

+1 −3
Original line number Diff line number Diff line
@@ -198,9 +198,7 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) 
			add_RATid(adapt, psta, 0);/* todo: based on rssi_level*/

#endif

	} else {

		if (adapt->HalFunc.UpdateRAMaskHandler)

			adapt->HalFunc.UpdateRAMaskHandler(adapt, mac_id,

							      rssi_level);

		UpdateHalRAMask8188EUsb(adapt, mac_id, rssi_level);

	}

}

drivers/staging/rtl8188eu/hal/usb_halinit.c

+1 −3
Original line number Diff line number Diff line
@@ -1933,7 +1933,7 @@ GetHalDefVar8188EUsb( 
	return bResult;

}



static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)

void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)

{

	u8 init_rate = 0;

	u8 networkType, raid;
@@ -2084,7 +2084,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->GetHwRegHandler = &GetHwReg8188EU;

	halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;



	halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;



	rtl8188e_set_hal_ops(halfunc);

}

drivers/staging/rtl8188eu/include/hal_intf.h

+1 −3
Original line number Diff line number Diff line
@@ -188,9 +188,6 @@ struct hal_ops { 
				       enum hal_odm_variable eVariable,

				       void *pValue1, bool bSet);



	void	(*UpdateRAMaskHandler)(struct adapter *padapter,

				       u32 mac_id, u8 rssi_level);



	void	(*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,

				u8 rssi_level);
@@ -230,6 +227,7 @@ enum hardware_type { 


#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)



void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level);

void rtw_hal_def_value_init(struct adapter *padapter);



void	rtw_hal_free_data(struct adapter *padapter);