From 041878d46ba37157814e6b650c9eff6efa7070d6 Mon Sep 17 00:00:00 2001 From: Fabio Aiuto Date: Thu, 29 Jul 2021 14:54:17 +0200 Subject: [PATCH] staging: rtl8723bs: remove unused BT static variables remove some unused static variables. One of them is used to toggle on the BT coexistence mechanism, but it is always enabled and it's not conditioned to the value of the related parameter. Remove unused field of the registry_priv struct as well, they were intended for hosting the parameters this patch rids. Signed-off-by: Fabio Aiuto Link: https://lore.kernel.org/r/20210729125417.4380-1-fabioaiuto83@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/include/drv_types.h | 4 ---- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 895c415..d49009c 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -139,10 +139,6 @@ struct registry_priv { u8 channel_plan; - u8 btcoex; - u8 bt_iso; - u8 bt_sco; - u8 bt_ampdu; s8 ant_num; /* false:Reject AP's Add BA req, true:accept AP's Add BA req */ diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c index b042df3..7359f08 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -95,12 +95,6 @@ static int rtw_low_power; static int rtw_wifi_spec; static int rtw_channel_plan = RT_CHANNEL_DOMAIN_MAX; -static int rtw_btcoex_enable = 1; -module_param(rtw_btcoex_enable, int, 0644); -MODULE_PARM_DESC(rtw_btcoex_enable, "Enable BT co-existence mechanism"); -static int rtw_bt_iso = 2;/* 0:Low, 1:High, 2:From Efuse */ -static int rtw_bt_sco = 3;/* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter, 4.Busy, 5.OtherBusy */ -static int rtw_bt_ampdu = 1 ;/* 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. */ static int rtw_ant_num = -1; /* <0: undefined, >0: Antenna number */ module_param(rtw_ant_num, int, 0644); MODULE_PARM_DESC(rtw_ant_num, "Antenna number setting"); @@ -263,10 +257,6 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev) registry_par->channel_plan = (u8)rtw_channel_plan; - registry_par->btcoex = (u8)rtw_btcoex_enable; - registry_par->bt_iso = (u8)rtw_bt_iso; - registry_par->bt_sco = (u8)rtw_bt_sco; - registry_par->bt_ampdu = (u8)rtw_bt_ampdu; registry_par->ant_num = (s8)rtw_ant_num; registry_par->accept_addba_req = true; -- 2.7.4