Commit a6bcac71 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove c2h_handler field from struct hal_ops 



Remove c2h_handler function pointer field from struct hal_ops in
include/hal_intf.h, as it is never set in this driver, and remove
the check for a non-NULL value in the rtw_hal_c2h_handler wrapper
function in hal/hal_intf.c as well. As the function always returns
_FAIL anyway, just modify it to do this unconditionally.

The motivation for removing this field is that it is more code from
the unwanted HAL layer that can be stripped out.

Acked-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Acked-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210829234541.946-2-phil@philpotter.co.uk


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

drivers/staging/r8188eu/hal/hal_intf.c

+1 −5
Original line number Diff line number Diff line
@@ -428,11 +428,7 @@ void rtw_hal_reset_security_engine(struct adapter *adapter) 


s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt)

{

	s32 ret = _FAIL;



	if (adapter->HalFunc.c2h_handler)

		ret = adapter->HalFunc.c2h_handler(adapter, c2h_evt);

	return ret;

	return _FAIL;

}



c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter)

drivers/staging/r8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ struct hal_ops { 


	void (*hal_notch_filter)(struct adapter *adapter, bool enable);

	void (*hal_reset_security_engine)(struct adapter *adapter);

	s32 (*c2h_handler)(struct adapter *padapter,

			   struct c2h_evt_hdr *c2h_evt);

	c2h_id_filter c2h_id_filter_ccx;

};