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

staging: r8188eu: remove HW_VAR_H2C_MEDIA_STATUS_RPT from SetHwReg8188EU() 



The HW_VAR_H2C_MEDIA_STATUS_RPT case in SetHwReg8188EU() only calls
rtl8188e_set_FwMediaStatus_cmd(). In order to get rid of
SetHwReg8188EU() remove the case HW_VAR_H2C_MEDIA_STATUS_RPT and call
rtl8188e_set_FwMediaStatus_cmd() directly.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220630061736.9200-1-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, 


	/* MACID|OPMODE:1 connect */

	media_status_rpt = (u16)((psta->mac_id << 8) | mstatus);

	SetHwReg8188EU(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status_rpt);

	rtl8188e_set_FwMediaStatus_cmd(adapter, media_status_rpt);

}



void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
@@ -1195,7 +1195,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) 
		u16 media_status;

		media_status = (mac_id << 8) | 0; /*   MACID|OPMODE:0 means disconnect */

		/* for STA, AP, ADHOC mode, report disconnect stauts to FW */

		SetHwReg8188EU(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status);

		rtl8188e_set_FwMediaStatus_cmd(adapter, media_status);

	}



	if (check_fwstate(pmlmepriv, WIFI_AP_STATE))

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -6708,7 +6708,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) 
		rtw_set_max_rpt_macid(padapter, psta->mac_id);



		media_status = (psta->mac_id << 8) | 1; /*   MACID|OPMODE: 1 means connect */

		SetHwReg8188EU(padapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status);

		rtl8188e_set_FwMediaStatus_cmd(padapter, media_status);

	}



	mlme_join(padapter, 2);

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −3
Original line number Diff line number Diff line
@@ -1235,9 +1235,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) 
			}

		}

		break;

	case HW_VAR_H2C_MEDIA_STATUS_RPT:

		rtl8188e_set_FwMediaStatus_cmd(Adapter, (*(__le16 *)val));

		break;

	default:

		break;

	}

drivers/staging/r8188eu/include/hal_intf.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ enum hw_variables { 
	HW_VAR_DM_FUNC_RESET,

	HW_VAR_DM_FUNC_CLR,

	HW_VAR_AMPDU_FACTOR,

	HW_VAR_H2C_MEDIA_STATUS_RPT,

};



typedef s32 (*c2h_id_filter)(u8 id);