Commit 608230e7 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove the sreset_priv structure 



last_tx_time from struct sreset_priv is no longer used now that
last_tx_complete_time is gone.

This patch removes last_tx_time. This was the last remaining component of
struct sreset_priv, we can now remove the structure itself.

After removing include/rtw_sreset.h, it turned out that some definitions
in .c files were pulled in via rtw_sreset.h. Add the required include
files directly to make compilation succeed without rtw_sreset.h.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211024180448.20624-6-martin@kaiser.cx


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

drivers/staging/r8188eu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ r8188eu-y = \ 
		core/rtw_recv.o \

		core/rtw_rf.o \

		core/rtw_security.o \

		core/rtw_sreset.o \

		core/rtw_sta_mgt.o \

		core/rtw_wlan_util.o \

		core/rtw_xmit.o

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include "../include/mlme_osdep.h"

#include "../include/recv_osdep.h"

#include "../include/rtl8188e_sreset.h"

#include "../include/rtl8188e_xmit.h"

#include "../include/rtl8188e_dm.h"



static struct mlme_handler mlme_sta_tbl[] = {

	{WIFI_ASSOCREQ,		"OnAssocReq",	&OnAssocReq},

drivers/staging/r8188eu/core/rtw_sreset.c

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2007 - 2012 Realtek Corporation. */



#include "../include/rtw_sreset.h"



void sreset_init_value(struct adapter *padapter)

{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);

	struct sreset_priv *psrtpriv = &pHalData->srestpriv;



	psrtpriv->last_tx_time = 0;

}

void sreset_reset_value(struct adapter *padapter)

{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);

	struct sreset_priv *psrtpriv = &pHalData->srestpriv;



	psrtpriv->last_tx_time = 0;

}

drivers/staging/r8188eu/include/rtl8188e_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ struct hal_data_8188e { 


	struct dm_priv	dmpriv;

	struct odm_dm_struct odmpriv;

	struct sreset_priv srestpriv;



	u8	CurAntenna;

	u8	AntDivCfg;

drivers/staging/r8188eu/include/rtl8188e_sreset.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


#include "osdep_service.h"

#include "drv_types.h"

#include "rtw_sreset.h"



void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);

void rtl8188e_sreset_linked_status_check(struct adapter *padapter);