Commit 9d411eee authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Remove phy_Config*WithParaFile() configuration leftovers 



Now that the phy_Config*WithParaFile() functions have been removed nothing
is using these module-parameters and defines anymore.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20191009123223.163241-3-hdegoede@redhat.com


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

drivers/staging/rtl8723bs/include/drv_types.h

+0 −4
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ struct registry_priv 
	u8 RFE_Type;

	u8  check_fw_ps;



	u8 load_phy_file;

	u8 RegDecryptCustomFile;



#ifdef CONFIG_MULTI_VIR_IFACES

	u8 ext_iface_num;/* primary/secondary iface is excluded */

#endif
@@ -693,7 +690,6 @@ void rtw_indicate_wx_disassoc_event(struct adapter *padapter); 
void indicate_wx_scan_complete_event(struct adapter *padapter);

int rtw_change_ifname(struct adapter *padapter, const char *ifname);



extern char *rtw_phy_file_path;

extern char *rtw_initmac;

extern int rtw_mc2u_disable;

extern int rtw_ht_enable;

drivers/staging/rtl8723bs/include/rtl8723b_hal.h

+0 −15
Original line number Diff line number Diff line
@@ -20,21 +20,6 @@ 
#include "hal_phy_reg_8723b.h"

#include "hal_phy_cfg.h"



/*  */

/* RTL8723B From file */

/*  */

#define RTL8723B_FW_IMG      "rtl8723b/FW_NIC.bin"

#define RTL8723B_FW_WW_IMG   "rtl8723b/FW_WoWLAN.bin"

#define RTL8723B_PHY_REG     "rtl8723b/PHY_REG.txt"

#define RTL8723B_PHY_RADIO_A "rtl8723b/RadioA.txt"

#define RTL8723B_PHY_RADIO_B "rtl8723b/RadioB.txt"

#define RTL8723B_TXPWR_TRACK "rtl8723b/TxPowerTrack.txt"

#define RTL8723B_AGC_TAB     "rtl8723b/AGC_TAB.txt"

#define RTL8723B_PHY_MACREG  "rtl8723b/MAC_REG.txt"

#define RTL8723B_PHY_REG_PG  "rtl8723b/PHY_REG_PG.txt"

#define RTL8723B_PHY_REG_MP  "rtl8723b/PHY_REG_MP.txt"

#define RTL8723B_TXPWR_LMT   "rtl8723b/TXPWR_LMT.txt"



/*  */

/* RTL8723B From header */

/*  */

drivers/staging/rtl8723bs/os_dep/os_intfs.c

+0 −20
Original line number Diff line number Diff line
@@ -201,24 +201,6 @@ MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 1:Enable, 2: Depend on efuse 
module_param(rtw_tx_pwr_by_rate, int, 0644);

MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on efuse");



char *rtw_phy_file_path = "";

module_param(rtw_phy_file_path, charp, 0644);

MODULE_PARM_DESC(rtw_phy_file_path, "The path of phy parameter");

/*  PHY FILE Bit Map */

/*  BIT0 - MAC,				0: non-support, 1: support */

/*  BIT1 - BB,					0: non-support, 1: support */

/*  BIT2 - BB_PG,				0: non-support, 1: support */

/*  BIT3 - BB_MP,				0: non-support, 1: support */

/*  BIT4 - RF,					0: non-support, 1: support */

/*  BIT5 - RF_TXPWR_TRACK,	0: non-support, 1: support */

/*  BIT6 - RF_TXPWR_LMT,		0: non-support, 1: support */

static int rtw_load_phy_file = (BIT2 | BIT6);

module_param(rtw_load_phy_file, int, 0644);

MODULE_PARM_DESC(rtw_load_phy_file, "PHY File Bit Map");

static int rtw_decrypt_phy_file;

module_param(rtw_decrypt_phy_file, int, 0644);

MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");



int _netdev_open(struct net_device *pnetdev);

int netdev_open (struct net_device *pnetdev);

static int netdev_close (struct net_device *pnetdev);
@@ -321,8 +303,6 @@ static void loadparam(struct adapter *padapter, _nic_hdl pnetdev) 
	registry_par->bEn_RFE = 1;

	registry_par->RFE_Type = 64;



	registry_par->load_phy_file = (u8)rtw_load_phy_file;

	registry_par->RegDecryptCustomFile = (u8)rtw_decrypt_phy_file;

	registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable;



	registry_par->hiq_filter = (u8)rtw_hiq_filter;

CRA Git | Maintained and supported by SUSTech CRA and CCSE