Commit 9f6c5162 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove read_chip_version from hal_ops 



Remove read_chip_version from hal_ops and remove its wrapper
rtw_hal_read_chip_version(). Call rtl8188e_read_chip_version()
directly instead

Acked-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210904124033.14244-4-straube.linux@gmail.com


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

drivers/staging/r8188eu/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -6,12 +6,6 @@ 
#include "../include/drv_types.h"

#include "../include/hal_intf.h"



void rtw_hal_read_chip_version(struct adapter *adapt)

{

	if (adapt->HalFunc.read_chip_version)

		adapt->HalFunc.read_chip_version(adapt);

}



void rtw_hal_def_value_init(struct adapter *adapt)

{

	if (adapt->HalFunc.init_default_value)

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+1 −3
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) 
	return ChipVersion;

}



static void rtl8188e_read_chip_version(struct adapter *padapter)

void rtl8188e_read_chip_version(struct adapter *padapter)

{

	ReadChipVersion8188E(padapter);

}
@@ -1798,8 +1798,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->dm_init = &rtl8188e_init_dm_priv;

	pHalFunc->dm_deinit = &rtl8188e_deinit_dm_priv;



	pHalFunc->read_chip_version = &rtl8188e_read_chip_version;



	pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E;

	pHalFunc->set_channel_handler = &PHY_SwChnl8188E;

drivers/staging/r8188eu/include/hal_intf.h

+0 −3
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ struct hal_ops { 


	void	(*dm_init)(struct adapter *padapter);

	void	(*dm_deinit)(struct adapter *padapter);

	void	(*read_chip_version)(struct adapter *padapter);



	void	(*init_default_value)(struct adapter *padapter);
@@ -283,8 +282,6 @@ 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);



void rtw_hal_read_chip_version(struct adapter *padapter);



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,

drivers/staging/r8188eu/include/rtl8188e_hal.h

+2 −0
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@ bool HalDetectPwrDownMode88E(struct adapter *Adapter); 
void Hal_InitChannelPlan(struct adapter *padapter);

void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc);



void rtl8188e_read_chip_version(struct adapter *padapter);



void rtl8188e_clone_haldata(struct adapter *dst, struct adapter *src);

void rtl8188e_start_thread(struct adapter *padapter);

void rtl8188e_stop_thread(struct adapter *padapter);

drivers/staging/r8188eu/os_dep/usb_intf.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "../include/usb_ops.h"

#include "../include/usb_osintf.h"

#include "../include/rtw_ioctl.h"

#include "../include/rtl8188e_hal.h"



int ui_pid[3] = {0, 0, 0};
@@ -599,7 +600,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	rtw_init_io_priv(padapter, usb_set_intf_ops);



	/* step read_chip_version */

	rtw_hal_read_chip_version(padapter);

	rtl8188e_read_chip_version(padapter);



	/* step usb endpoint mapping */

	rtl8188eu_interface_configure(padapter);