Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: r8188eu: remove the sreset_priv structure

Browse Source 
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: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211024180448.20624-6-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2021-10-24 20:04:48 +02:00 committed by Greg Kroah-Hartman
parent 562f1bf39a
commit 608230e733
8 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/r8188eu/Makefile
View File

@ -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

2
drivers/staging/r8188eu/core/rtw_mlme_ext.c
View File

@ -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},

19
drivers/staging/r8188eu/core/rtw_sreset.c
View File

@ -1,19 +0,0 @@
// 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;
}

1
drivers/staging/r8188eu/include/rtl8188e_hal.h
View File

@ -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;

1
drivers/staging/r8188eu/include/rtl8188e_sreset.h
View File

@ -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);

19
drivers/staging/r8188eu/include/rtw_sreset.h
View File

@ -1,19 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
/* Copyright(c) 2007 - 2012 Realtek Corporation. */
#ifndef _RTW_SRESET_C_
#define _RTW_SRESET_C_
#include "osdep_service.h"
#include "drv_types.h"
struct sreset_priv {
unsigned long last_tx_time;
};
#include "rtl8188e_hal.h"
void sreset_init_value(struct adapter *padapter);
void sreset_reset_value(struct adapter *padapter);
#endif

4
drivers/staging/r8188eu/os_dep/os_intfs.c
View File

@ -13,7 +13,6 @@
#include "../include/rtw_br_ext.h"
#include "../include/rtl8188e_led.h"
#include "../include/rtl8188e_dm.h"
#include "../include/rtw_sreset.h"
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
@ -467,7 +466,6 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
sreset_reset_value(padapter);
pwrctrlpriv->pwr_state_check_cnts = 0;
/* mlmeextpriv */
@ -537,8 +535,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
rtl8188e_init_dm_priv(padapter);
rtl8188eu_InitSwLeds(padapter);
sreset_init_value(padapter);
spin_lock_init(&padapter->br_ext_lock);
exit:

8
drivers/staging/r8188eu/os_dep/usb_ops_linux.c
View File

@ -5,7 +5,7 @@
#include "../include/drv_types.h"
#include "../include/usb_ops_linux.h"
#include "../include/rtw_sreset.h"
#include "../include/rtl8188e_recv.h"
unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)
{
@ -176,11 +176,7 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem)
pxmitbuf);/* context is pxmitbuf */
status = usb_submit_urb(purb, GFP_ATOMIC);
if (!status) {
struct hal_data_8188e *haldata = GET_HAL_DATA(padapter);
haldata->srestpriv.last_tx_time = jiffies;
} else {
if (status) {
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR);
DBG_88E("usb_write_port, status =%d\n", status);