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

staging: r8188eu: rename rtl8188eu_InitPowerOn to rtw_hal_power_on 



And remove many one-line wrappers.

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

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -37,13 +37,6 @@ void rtw_hal_dm_init(struct adapter *adapt) 
		adapt->HalFunc.dm_init(adapt);

		adapt->HalFunc.dm_init(adapt);

}

}





u32 rtw_hal_power_on(struct adapter *adapt)

{

	if (adapt->HalFunc.hal_power_on)

		return adapt->HalFunc.hal_power_on(adapt);

	return _FAIL;

}



uint	 rtw_hal_init(struct adapter *adapt)

uint	 rtw_hal_init(struct adapter *adapt)

{

{

	uint	status = _SUCCESS;

	uint	status = _SUCCESS;

drivers/staging/rtl8188eu/hal/usb_halinit.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ void rtw_hal_chip_configure(struct adapter *adapt) 
				pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);

				pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);

}

}





static u32 rtl8188eu_InitPowerOn(struct adapter *adapt)

u32 rtw_hal_power_on(struct adapter *adapt)

{

{

	u16 value16;

	u16 value16;

	/*  HW Power on sequence */

	/*  HW Power on sequence */
@@ -702,7 +702,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) 
	}

	}





	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);

	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);

	status = rtl8188eu_InitPowerOn(Adapter);

	status = rtw_hal_power_on(Adapter);

	if (status == _FAIL) {

	if (status == _FAIL) {

		RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n"));

		RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n"));

		goto exit;

		goto exit;
@@ -2050,7 +2050,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	if (!adapt->HalData)

	if (!adapt->HalData)

		DBG_88E("cant not alloc memory for HAL DATA\n");

		DBG_88E("cant not alloc memory for HAL DATA\n");





	halfunc->hal_power_on = rtl8188eu_InitPowerOn;



	rtl8188e_set_hal_ops(halfunc);

	rtl8188e_set_hal_ops(halfunc);

}
 
}

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -140,8 +140,6 @@ enum hal_intf_ps_func { 
};

};





struct hal_ops {

struct hal_ops {

	u32	(*hal_power_on)(struct adapter *padapter);



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

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





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

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