Commit 6ca25a31 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo

wifi: rtw88: remove unused and set but unused leftovers

Drop unused and set but unused 'last_push' of 'struct rtw_txq',
'wireless_set' of 'struct rtw_sta_info', 'usb_txagg_num' of
'struct rtw_usb' and 'n' of 'struct rx_usb_ctrl_block', unused
definition of 'struct rtw_timer_list', adjust related code.
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230628072327.167196-2-dmantipov@yandex.ru
parent 634fcbca
...@@ -1303,7 +1303,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si, ...@@ -1303,7 +1303,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si,
si->stbc_en = stbc_en; si->stbc_en = stbc_en;
si->ldpc_en = ldpc_en; si->ldpc_en = ldpc_en;
si->rf_type = rf_type; si->rf_type = rf_type;
si->wireless_set = wireless_set;
si->sgi_enable = is_support_sgi; si->sgi_enable = is_support_sgi;
si->vht_enable = is_vht_enable; si->vht_enable = is_vht_enable;
si->ra_mask = ra_mask; si->ra_mask = ra_mask;
......
...@@ -511,12 +511,6 @@ struct rtw_txpwr_idx { ...@@ -511,12 +511,6 @@ struct rtw_txpwr_idx {
struct rtw_5g_txpwr_idx pwr_idx_5g; struct rtw_5g_txpwr_idx pwr_idx_5g;
}; };
struct rtw_timer_list {
struct timer_list timer;
void (*function)(void *data);
void *args;
};
struct rtw_channel_params { struct rtw_channel_params {
u8 center_chan; u8 center_chan;
u8 primary_chan; u8 primary_chan;
...@@ -734,9 +728,7 @@ struct rtw_ra_report { ...@@ -734,9 +728,7 @@ struct rtw_ra_report {
struct rtw_txq { struct rtw_txq {
struct list_head list; struct list_head list;
unsigned long flags; unsigned long flags;
unsigned long last_push;
}; };
#define RTW_BC_MC_MACID 1 #define RTW_BC_MC_MACID 1
...@@ -754,7 +746,6 @@ struct rtw_sta_info { ...@@ -754,7 +746,6 @@ struct rtw_sta_info {
u8 rate_id; u8 rate_id;
enum rtw_bandwidth bw_mode; enum rtw_bandwidth bw_mode;
enum rtw_rf_type rf_type; enum rtw_rf_type rf_type;
enum rtw_wireless_set wireless_set;
u8 stbc_en:2; u8 stbc_en:2;
u8 ldpc_en:2; u8 ldpc_en:2;
bool sgi_enable; bool sgi_enable;
......
...@@ -606,8 +606,6 @@ static int rtw_txq_push_skb(struct rtw_dev *rtwdev, ...@@ -606,8 +606,6 @@ static int rtw_txq_push_skb(struct rtw_dev *rtwdev,
rtw_err(rtwdev, "failed to write TX skb to HCI\n"); rtw_err(rtwdev, "failed to write TX skb to HCI\n");
return ret; return ret;
} }
rtwtxq->last_push = jiffies;
return 0; return 0;
} }
......
...@@ -654,7 +654,6 @@ static int rtw_usb_alloc_rx_bufs(struct rtw_usb *rtwusb) ...@@ -654,7 +654,6 @@ static int rtw_usb_alloc_rx_bufs(struct rtw_usb *rtwusb)
for (i = 0; i < RTW_USB_RXCB_NUM; i++) { for (i = 0; i < RTW_USB_RXCB_NUM; i++) {
struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i]; struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i];
rxcb->n = i;
rxcb->rtwdev = rtwusb->rtwdev; rxcb->rtwdev = rtwusb->rtwdev;
rxcb->rx_urb = usb_alloc_urb(0, GFP_KERNEL); rxcb->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!rxcb->rx_urb) if (!rxcb->rx_urb)
......
...@@ -58,7 +58,6 @@ struct rx_usb_ctrl_block { ...@@ -58,7 +58,6 @@ struct rx_usb_ctrl_block {
struct rtw_dev *rtwdev; struct rtw_dev *rtwdev;
struct urb *rx_urb; struct urb *rx_urb;
struct sk_buff *rx_skb; struct sk_buff *rx_skb;
int n;
}; };
struct rtw_usb_tx_data { struct rtw_usb_tx_data {
...@@ -79,7 +78,6 @@ struct rtw_usb { ...@@ -79,7 +78,6 @@ struct rtw_usb {
u8 pipe_in; u8 pipe_in;
u8 out_ep[RTW_USB_EP_MAX]; u8 out_ep[RTW_USB_EP_MAX];
int qsel_to_ep[TX_DESC_QSEL_MAX]; int qsel_to_ep[TX_DESC_QSEL_MAX];
u8 usb_txagg_num;
struct workqueue_struct *txwq, *rxwq; struct workqueue_struct *txwq, *rxwq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment