Commit 7d4b344b authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove intf_chip_configure from hal_ops 



Remove intf_chip_configure from hal_ops and remove its wrapper
rtw_hal_chip_configure(). Call rtl8188eu_interface_configure()
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-2-straube.linux@gmail.com


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

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_chip_configure(struct adapter *adapt)

{

	if (adapt->HalFunc.intf_chip_configure)

		adapt->HalFunc.intf_chip_configure(adapt);

}



void rtw_hal_read_chip_info(struct adapter *adapt)

{

	if (adapt->HalFunc.read_adapter_info)

drivers/staging/r8188eu/hal/usb_halinit.c

+1 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(struct adapter *adapt, u8 NumInPip 
	return result;

}



static void rtl8188eu_interface_configure(struct adapter *adapt)

void rtl8188eu_interface_configure(struct adapter *adapt)

{

	struct hal_data_8188e	*haldata	= GET_HAL_DATA(adapt);

	struct dvobj_priv	*pdvobjpriv = adapter_to_dvobj(adapt);
@@ -2250,7 +2250,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->DeInitSwLeds = &rtl8188eu_DeInitSwLeds;



	halfunc->init_default_value = &rtl8188eu_init_default_value;

	halfunc->intf_chip_configure = &rtl8188eu_interface_configure;

	halfunc->read_adapter_info = &ReadAdapterInfo8188EU;



	halfunc->SetHwRegHandler = &SetHwReg8188EU;

drivers/staging/r8188eu/include/hal_intf.h

+3 −3
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ struct hal_ops { 


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



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



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



	void	(*enable_interrupt)(struct adapter *padapter);
@@ -267,6 +265,9 @@ struct hal_ops { 
#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)



void rtl8188eu_set_hal_ops(struct adapter *padapter);



void rtl8188eu_interface_configure(struct adapter *adapt);



void rtw_hal_def_value_init(struct adapter *padapter);



void	rtw_hal_free_data(struct adapter *padapter);
@@ -283,7 +284,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_chip_configure(struct adapter *padapter);

void rtw_hal_read_chip_info(struct adapter *padapter);

void rtw_hal_read_chip_version(struct adapter *padapter);

drivers/staging/r8188eu/os_dep/usb_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	rtw_hal_read_chip_version(padapter);



	/* step usb endpoint mapping */

	rtw_hal_chip_configure(padapter);

	rtl8188eu_interface_configure(padapter);



	/* step read efuse/eeprom data and get mac_addr */

	rtw_hal_read_chip_info(padapter);