Commit 3691b585 authored by 谢致邦 (XIE Zhibang)'s avatar 谢致邦 (XIE Zhibang) Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Remove some unused functions, macros, and structs 



Remove some functions, macros, and structs that have not been used since
they were introduced in commit 554c0a3a ("staging: Add rtl8723bs
sdio wifi driver").

Signed-off-by: default avatar谢致邦 (XIE Zhibang) <Yeking@Red54.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/tencent_C69BFF8D3EC7B66BFCF0063ED3DEF4BC590A@qq.com


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

drivers/staging/rtl8723bs/hal/hal_com.c

+3 −0
Original line number Diff line number Diff line
@@ -884,6 +884,9 @@ static u32 Array_kfreemap[] = { 
	0xfc, 0x0,

};



#define		REG_RF_BB_GAIN_OFFSET	0x7f

//#define		RF_GAIN_OFFSET_MASK	0xfffff



void rtw_bb_rf_gain_offset(struct adapter *padapter)

{

	u8 value = padapter->eeprompriv.EEPROMRFGainOffset;

drivers/staging/rtl8723bs/include/osdep_intf.h

+0 −27
Original line number Diff line number Diff line
@@ -8,33 +8,6 @@ 
#ifndef __OSDEP_INTF_H_

#define __OSDEP_INTF_H_





struct intf_priv {



	u8 *intf_dev;

	u32 max_iosz;	/* USB2.0: 128, USB1.1: 64, SDIO:64 */

	u32 max_xmitsz; /* USB2.0: unlimited, SDIO:512 */

	u32 max_recvsz; /* USB2.0: unlimited, SDIO:512 */



	volatile u8 *io_rwmem;

	volatile u8 *allocated_io_rwmem;

	u32 io_wsz; /* unit: 4bytes */

	u32 io_rsz;/* unit: 4bytes */

	u8 intf_status;



	void (*_bus_io)(u8 *priv);



/*

Under Sync. IRP (SDIO/USB)

A protection mechanism is necessary for the io_rwmem(read/write protocol)



Under Async. IRP (SDIO/USB)

The protection mechanism is through the pending queue.

*/



	struct mutex ioctl_mutex;

};



struct dvobj_priv *devobj_init(void);

void devobj_deinit(struct dvobj_priv *pdvobj);

drivers/staging/rtl8723bs/include/rtl8723b_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "rtl8723b_recv.h"

#include "rtl8723b_xmit.h"

#include "rtl8723b_cmd.h"

#include "rtw_mp.h"

#include "hal_pwr_seq.h"

#include "Hal8192CPhyReg.h"

#include "hal_phy_cfg.h"

drivers/staging/rtl8723bs/include/rtw_io.h

+0 −92
Original line number Diff line number Diff line
@@ -8,16 +8,7 @@ 
#ifndef _RTW_IO_H_

#define _RTW_IO_H_



/*

	For prompt mode accessing, caller shall free io_req

	Otherwise, io_handler will free io_req

*/



/* below is for the intf_option bit definition... */



struct intf_priv;

struct intf_hdl;

struct io_queue;



struct _io_ops {

		u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr);
@@ -36,8 +27,6 @@ struct _io_ops { 
		void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);

		void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);



		void (*_sync_irp_protocol_rw)(struct io_queue *pio_q);



		u32 (*_read_interrupt)(struct intf_hdl *pintfhdl, u32 addr);



		u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
@@ -49,18 +38,6 @@ struct _io_ops { 
		void (*_write_port_cancel)(struct intf_hdl *pintfhdl);

};



struct io_req {

	struct list_head	list;

	u32 addr;

	volatile u32 val;

	u32 command;

	u32 status;

	u8 *pbuf;



	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt);

	u8 *cnxt;

};



struct	intf_hdl {

	struct adapter *padapter;

	struct dvobj_priv *pintf_dev;/* 	pointer to &(padapter->dvobjpriv); */
@@ -74,21 +51,6 @@ struct intf_hdl { 
int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj);

void rtw_reset_continual_io_error(struct dvobj_priv *dvobj);



/*

Below is the data structure used by _io_handler



*/



struct io_queue {

	spinlock_t	lock;

	struct list_head	free_ioreqs;

	struct list_head		pending;		/* The io_req list that will be served in the single protocol read/write. */

	struct list_head		processing;

	u8 *free_ioreqs_buf; /*  4-byte aligned */

	u8 *pallocated_free_ioreqs_buf;

	struct	intf_hdl	intf;

};



struct io_priv {



	struct adapter *padapter;
@@ -97,20 +59,6 @@ struct io_priv { 


};



extern uint ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue);

extern void sync_ioreq_enqueue(struct io_req *preq, struct io_queue *ioqueue);

extern uint sync_ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue);





extern uint free_ioreq(struct io_req *preq, struct io_queue *pio_queue);

extern struct io_req *alloc_ioreq(struct io_queue *pio_q);



extern uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl);

extern void unregister_intf_hdl(struct intf_hdl *pintfhdl);



extern void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);



extern u8 rtw_read8(struct adapter *adapter, u32 addr);

extern u16 rtw_read16(struct adapter *adapter, u32 addr);

extern u32 rtw_read32(struct adapter *adapter, u32 addr);
@@ -121,46 +69,6 @@ extern int rtw_write32(struct adapter *adapter, u32 addr, u32 val); 


extern u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);



extern void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem);



/* ioreq */

extern void ioreq_read8(struct adapter *adapter, u32 addr, u8 *pval);

extern void ioreq_read16(struct adapter *adapter, u32 addr, u16 *pval);

extern void ioreq_read32(struct adapter *adapter, u32 addr, u32 *pval);

extern void ioreq_write8(struct adapter *adapter, u32 addr, u8 val);

extern void ioreq_write16(struct adapter *adapter, u32 addr, u16 val);

extern void ioreq_write32(struct adapter *adapter, u32 addr, u32 val);





extern uint async_read8(struct adapter *adapter, u32 addr, u8 *pbuff,

	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);

extern uint async_read16(struct adapter *adapter, u32 addr,  u8 *pbuff,

	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);

extern uint async_read32(struct adapter *adapter, u32 addr,  u8 *pbuff,

	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);



extern void async_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

extern void async_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);



extern void async_write8(struct adapter *adapter, u32 addr, u8 val,

	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);

extern void async_write16(struct adapter *adapter, u32 addr, u16 val,

	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);

extern void async_write32(struct adapter *adapter, u32 addr, u32 val,

	void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);



extern void async_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

extern void async_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);





int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct adapter *padapter, struct _io_ops *pops));





extern uint alloc_io_queue(struct adapter *adapter);

extern void free_io_queue(struct adapter *adapter);

extern void async_bus_io(struct io_queue *pio_q);

extern void bus_sync_io(struct io_queue *pio_q);

extern u32 _ioreq2rwmem(struct io_queue *pio_q);

extern void dev_power_down(struct adapter *Adapter, u8 bpwrup);



#endif	/* _RTL8711_IO_H_ */

drivers/staging/rtl8723bs/include/rtw_mp.h

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

/******************************************************************************

 *

 * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.

 *

 ******************************************************************************/

#ifndef _RTW_MP_H_

#define _RTW_MP_H_



#define MAX_MP_XMITBUF_SZ	2048



struct mp_xmit_frame {

	struct list_head	list;



	struct pkt_attrib attrib;



	struct sk_buff *pkt;



	int frame_tag;



	struct adapter *padapter;



	uint mem[(MAX_MP_XMITBUF_SZ >> 2)];

};



struct mp_wiparam {

	u32 bcompleted;

	u32 act_type;

	u32 io_offset;

	u32 io_value;

};



struct mp_tx {

	u8 stop;

	u32 count, sended;

	u8 payload;

	struct pkt_attrib attrib;

	/* struct tx_desc desc; */

	/* u8 resvdtx[7]; */

	u8 desc[TXDESC_SIZE];

	u8 *pallocated_buf;

	u8 *buf;

	u32 buf_size, write_size;

	void *PktTxThread;

};



#define MP_MAX_LINES		1000

#define MP_MAX_LINES_BYTES	256



typedef void (*MPT_WORK_ITEM_HANDLER)(void *Adapter);

struct mpt_context {

	/*  Indicate if we have started Mass Production Test. */

	bool			bMassProdTest;



	/*  Indicate if the driver is unloading or unloaded. */

	bool			bMptDrvUnload;



	struct timer_list			MPh2c_timeout_timer;

/*  Event used to sync H2c for BT control */



	bool		MptH2cRspEvent;

	bool		MptBtC2hEvent;

	bool		bMPh2c_timeout;



	/* 8190 PCI does not support NDIS_WORK_ITEM. */

	/*  Work Item for Mass Production Test. */

	/* NDIS_WORK_ITEM	MptWorkItem; */

/* 	RT_WORK_ITEM		MptWorkItem; */

	/*  Event used to sync the case unloading driver and MptWorkItem is still in progress. */

/* 	NDIS_EVENT		MptWorkItemEvent; */

	/*  To protect the following variables. */

/* 	NDIS_SPIN_LOCK		MptWorkItemSpinLock; */

	/*  Indicate a MptWorkItem is scheduled and not yet finished. */

	bool			bMptWorkItemInProgress;

	/*  An instance which implements function and context of MptWorkItem. */

	MPT_WORK_ITEM_HANDLER	CurrMptAct;



	/*  1 =Start, 0 =Stop from UI. */

	u32 		MptTestStart;

	/*  _TEST_MODE, defined in MPT_Req2.h */

	u32 		MptTestItem;

	/*  Variable needed in each implementation of CurrMptAct. */

	u32 		MptActType;	/*  Type of action performed in CurrMptAct. */

	/*  The Offset of IO operation is depend of MptActType. */

	u32 		MptIoOffset;

	/*  The Value of IO operation is depend of MptActType. */

	u32 		MptIoValue;

	/*  The RfPath of IO operation is depend of MptActType. */

	u32 		MptRfPath;



	enum wireless_mode		MptWirelessModeToSw;	/*  Wireless mode to switch. */

	u8 	MptChannelToSw;		/*  Channel to switch. */

	u8 	MptInitGainToSet;	/*  Initial gain to set. */

	u32 		MptBandWidth;		/*  bandwidth to switch. */

	u32 		MptRateIndex;		/*  rate index. */

	/*  Register value kept for Single Carrier Tx test. */

	u8 	btMpCckTxPower;

	/*  Register value kept for Single Carrier Tx test. */

	u8 	btMpOfdmTxPower;

	/*  For MP Tx Power index */

	u8 	TxPwrLevel[2];	/*  rf-A, rf-B */

	u32 		RegTxPwrLimit;

	/*  Content of RCR Register for Mass Production Test. */

	u32 		MptRCR;

	/*  true if we only receive packets with specific pattern. */

	bool			bMptFilterPattern;

	/*  Rx OK count, statistics used in Mass Production Test. */

	u32 		MptRxOkCnt;

	/*  Rx CRC32 error count, statistics used in Mass Production Test. */

	u32 		MptRxCrcErrCnt;



	bool			bCckContTx;	/*  true if we are in CCK Continuous Tx test. */

	bool			bOfdmContTx;	/*  true if we are in OFDM Continuous Tx test. */

	bool			bStartContTx;	/*  true if we have start Continuous Tx test. */

	/*  true if we are in Single Carrier Tx test. */

	bool			bSingleCarrier;

	/*  true if we are in Carrier Suppression Tx Test. */

	bool			bCarrierSuppression;

	/* true if we are in Single Tone Tx test. */

	bool			bSingleTone;



	/*  ACK counter asked by K.Y.. */

	bool			bMptEnableAckCounter;

	u32 		MptAckCounter;



	/*  SD3 Willis For 8192S to save 1T/2T RF table for ACUT	Only fro ACUT delete later ~~~! */

	/* s8		BufOfLines[2][MAX_LINES_HWCONFIG_TXT][MAX_BYTES_LINE_HWCONFIG_TXT]; */

	/* s8			BufOfLines[2][MP_MAX_LINES][MP_MAX_LINES_BYTES]; */

	/* s32			RfReadLine[2]; */



	u8 APK_bound[2];	/* for APK	path A/path B */

	bool		bMptIndexEven;



	u8 backup0xc50;

	u8 backup0xc58;

	u8 backup0xc30;

	u8 backup0x52_RF_A;

	u8 backup0x52_RF_B;



	u32 		backup0x58_RF_A;

	u32 		backup0x58_RF_B;



	u8 	h2cReqNum;

	u8 	c2hBuf[32];



    u8          btInBuf[100];

	u32 		mptOutLen;

    u8          mptOutBuf[100];



};

/* endif */



/* define RTPRIV_IOCTL_MP					(SIOCIWFIRSTPRIV + 0x17) */

enum {

	WRITE_REG = 1,

	READ_REG,

	WRITE_RF,

	READ_RF,

	MP_START,

	MP_STOP,

	MP_RATE,

	MP_CHANNEL,

	MP_BANDWIDTH,

	MP_TXPOWER,

	MP_ANT_TX,

	MP_ANT_RX,

	MP_CTX,

	MP_QUERY,

	MP_ARX,

	MP_PSD,

	MP_PWRTRK,

	MP_THER,

	MP_IOCTL,

	EFUSE_GET,

	EFUSE_SET,

	MP_RESET_STATS,

	MP_DUMP,

	MP_PHYPARA,

	MP_SetRFPathSwh,

	MP_QueryDrvStats,

	MP_SetBT,

	CTA_TEST,

	MP_DISABLE_BT_COEXIST,

	MP_PwrCtlDM,

	MP_NULL,

	MP_GET_TXPOWER_INX,

};



struct mp_priv {

	struct adapter *papdater;



	/* Testing Flag */

	u32 mode;/* 0 for normal type packet, 1 for loopback packet (16bytes TXCMD) */



	u32 prev_fw_state;



	/* OID cmd handler */

	struct mp_wiparam workparam;

/* 	u8 act_in_progress; */



	/* Tx Section */

	u8 TID;

	u32 tx_pktcount;

	u32 pktInterval;

	struct mp_tx tx;



	/* Rx Section */

	u32 rx_bssidpktcount;

	u32 rx_pktcount;

	u32 rx_pktcount_filter_out;

	u32 rx_crcerrpktcount;

	u32 rx_pktloss;

	bool  rx_bindicatePkt;

	struct recv_stat rxstat;



	/* RF/BB relative */

	u8 channel;

	u8 bandwidth;

	u8 prime_channel_offset;

	u8 txpoweridx;

	u8 txpoweridx_b;

	u8 rateidx;

	u32 preamble;

/* 	u8 modem; */

	u32 CrystalCap;

/* 	u32 curr_crystalcap; */



	u16 antenna_tx;

	u16 antenna_rx;

/* 	u8 curr_rfpath; */



	u8 check_mp_pkt;



	u8 bSetTxPower;

/* 	uint ForcedDataRate; */

	u8 mp_dm;

	u8 mac_filter[ETH_ALEN];

	u8 bmac_filter;



	struct wlan_network mp_network;

	NDIS_802_11_MAC_ADDRESS network_macaddr;



	u8 *pallocated_mp_xmitframe_buf;

	u8 *pmp_xmtframe_buf;

	struct __queue free_mp_xmitqueue;

	u32 free_mp_xmitframe_cnt;

	bool bSetRxBssid;

	bool bTxBufCkFail;



	struct mpt_context MptCtx;



	u8 *TXradomBuffer;

};



/* Hardware Registers */

extern u8 mpdatarate[NumRates];



#define MAX_TX_PWR_INDEX_N_MODE 64	/*  0x3F */



#define		REG_RF_BB_GAIN_OFFSET	0x7f

#define		RF_GAIN_OFFSET_MASK	0xfffff



/*  */

/* struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv); */

/* int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe); */



s32 init_mp_priv(struct adapter *padapter);

void free_mp_priv(struct mp_priv *pmp_priv);

s32 MPT_InitializeAdapter(struct adapter *padapter, u8 Channel);

void MPT_DeInitAdapter(struct adapter *padapter);

s32 mp_start_test(struct adapter *padapter);

void mp_stop_test(struct adapter *padapter);



u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask);

void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val);



u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz);

void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz);



void SetChannel(struct adapter *padapter);

void SetBandwidth(struct adapter *padapter);

int SetTxPower(struct adapter *padapter);

void SetAntennaPathPower(struct adapter *padapter);

void SetDataRate(struct adapter *padapter);



void SetAntenna(struct adapter *padapter);



s32 SetThermalMeter(struct adapter *padapter, u8 target_ther);

void GetThermalMeter(struct adapter *padapter, u8 *value);



void SetContinuousTx(struct adapter *padapter, u8 bStart);

void SetSingleCarrierTx(struct adapter *padapter, u8 bStart);

void SetSingleToneTx(struct adapter *padapter, u8 bStart);

void SetCarrierSuppressionTx(struct adapter *padapter, u8 bStart);

void PhySetTxPowerLevel(struct adapter *padapter);



void fill_txdesc_for_mp(struct adapter *padapter, u8 *ptxdesc);

void SetPacketTx(struct adapter *padapter);

void SetPacketRx(struct adapter *padapter, u8 bStartRx);



void ResetPhyRxPktCount(struct adapter *padapter);

u32 GetPhyRxPktReceived(struct adapter *padapter);

u32 GetPhyRxPktCRC32Error(struct adapter *padapter);



s32	SetPowerTracking(struct adapter *padapter, u8 enable);

void GetPowerTracking(struct adapter *padapter, u8 *enable);



u32 mp_query_psd(struct adapter *padapter, u8 *data);



void Hal_SetAntenna(struct adapter *padapter);

void Hal_SetBandwidth(struct adapter *padapter);



void Hal_SetTxPower(struct adapter *padapter);

void Hal_SetCarrierSuppressionTx(struct adapter *padapter, u8 bStart);

void Hal_SetSingleToneTx(struct adapter *padapter, u8 bStart);

void Hal_SetSingleCarrierTx(struct adapter *padapter, u8 bStart);

void Hal_SetContinuousTx(struct adapter *padapter, u8 bStart);



void Hal_SetDataRate(struct adapter *padapter);

void Hal_SetChannel(struct adapter *padapter);

void Hal_SetAntennaPathPower(struct adapter *padapter);

s32 Hal_SetThermalMeter(struct adapter *padapter, u8 target_ther);

s32 Hal_SetPowerTracking(struct adapter *padapter, u8 enable);

void Hal_GetPowerTracking(struct adapter *padapter, u8 *enable);

void Hal_GetThermalMeter(struct adapter *padapter, u8 *value);

void Hal_mpt_SwitchRfSetting(struct adapter *padapter);

void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, bool bInCH14);

void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *padapter, bool beven);

void Hal_SetCCKTxPower(struct adapter *padapter, u8 *TxPower);

void Hal_SetOFDMTxPower(struct adapter *padapter, u8 *TxPower);

void Hal_TriggerRFThermalMeter(struct adapter *padapter);

u8 Hal_ReadRFThermalMeter(struct adapter *padapter);

void Hal_SetCCKContinuousTx(struct adapter *padapter, u8 bStart);

void Hal_SetOFDMContinuousTx(struct adapter *padapter, u8 bStart);

void Hal_ProSetCrystalCap(struct adapter *padapter, u32 CrystalCapVal);

void MP_PHY_SetRFPathSwitch(struct adapter *padapter, bool bMain);

u32 mpt_ProQueryCalTxPower(struct adapter *padapter, u8 RfPath);

void MPT_PwrCtlDM(struct adapter *padapter, u32 bstart);

u8 MptToMgntRate(u32 MptRateIdx);



#endif /* _RTW_MP_H_ */