Commit 7e197d3a authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove rx_logs/tx_logs/int_logs from drv_types.h 



Remove the rx_logs/tx_logs/int_logs struct definitions and their
inclusion within struct adapter as fields, from include/drv_types.h.
They were conditionally compiled based on CONFIG_DBG_COUNTER which
now has no other users in the driver, and were only ever accessed
in a write only fashion via the DBG_COUNTER macro, which has also
been removed.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210215233440.80617-7-phil@philpotter.co.uk


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

drivers/staging/rtl8723bs/include/drv_types.h

+0 −131
Original line number Diff line number Diff line
@@ -219,131 +219,6 @@ struct registry_priv { 
#define GET_IFACE_NUMS(padapter) (((struct adapter *)padapter)->dvobj->iface_nums)

#define GET_ADAPTER(padapter, iface_id) (((struct adapter *)padapter)->dvobj->padapters[iface_id])



#ifdef CONFIG_DBG_COUNTER



struct rx_logs {

	u32 intf_rx;

	u32 intf_rx_err_recvframe;

	u32 intf_rx_err_skb;

	u32 intf_rx_report;

	u32 core_rx;

	u32 core_rx_pre;

	u32 core_rx_pre_ver_err;

	u32 core_rx_pre_mgmt;

	u32 core_rx_pre_mgmt_err_80211w;

	u32 core_rx_pre_mgmt_err;

	u32 core_rx_pre_ctrl;

	u32 core_rx_pre_ctrl_err;

	u32 core_rx_pre_data;

	u32 core_rx_pre_data_wapi_seq_err;

	u32 core_rx_pre_data_wapi_key_err;

	u32 core_rx_pre_data_handled;

	u32 core_rx_pre_data_err;

	u32 core_rx_pre_data_unknown;

	u32 core_rx_pre_unknown;

	u32 core_rx_enqueue;

	u32 core_rx_dequeue;

	u32 core_rx_post;

	u32 core_rx_post_decrypt;

	u32 core_rx_post_decrypt_wep;

	u32 core_rx_post_decrypt_tkip;

	u32 core_rx_post_decrypt_aes;

	u32 core_rx_post_decrypt_wapi;

	u32 core_rx_post_decrypt_hw;

	u32 core_rx_post_decrypt_unknown;

	u32 core_rx_post_decrypt_err;

	u32 core_rx_post_defrag_err;

	u32 core_rx_post_portctrl_err;

	u32 core_rx_post_indicate;

	u32 core_rx_post_indicate_in_oder;

	u32 core_rx_post_indicate_reoder;

	u32 core_rx_post_indicate_err;

	u32 os_indicate;

	u32 os_indicate_ap_mcast;

	u32 os_indicate_ap_forward;

	u32 os_indicate_ap_self;

	u32 os_indicate_err;

	u32 os_netif_ok;

	u32 os_netif_err;

};



struct tx_logs {

	u32 os_tx;

	u32 os_tx_err_up;

	u32 os_tx_err_xmit;

	u32 os_tx_m2u;

	u32 os_tx_m2u_ignore_fw_linked;

	u32 os_tx_m2u_ignore_self;

	u32 os_tx_m2u_entry;

	u32 os_tx_m2u_entry_err_xmit;

	u32 os_tx_m2u_entry_err_skb;

	u32 os_tx_m2u_stop;

	u32 core_tx;

	u32 core_tx_err_pxmitframe;

	u32 core_tx_err_brtx;

	u32 core_tx_upd_attrib;

	u32 core_tx_upd_attrib_adhoc;

	u32 core_tx_upd_attrib_sta;

	u32 core_tx_upd_attrib_ap;

	u32 core_tx_upd_attrib_unknown;

	u32 core_tx_upd_attrib_dhcp;

	u32 core_tx_upd_attrib_icmp;

	u32 core_tx_upd_attrib_active;

	u32 core_tx_upd_attrib_err_ucast_sta;

	u32 core_tx_upd_attrib_err_ucast_ap_link;

	u32 core_tx_upd_attrib_err_sta;

	u32 core_tx_upd_attrib_err_link;

	u32 core_tx_upd_attrib_err_sec;

	u32 core_tx_ap_enqueue_warn_fwstate;

	u32 core_tx_ap_enqueue_warn_sta;

	u32 core_tx_ap_enqueue_warn_nosta;

	u32 core_tx_ap_enqueue_warn_link;

	u32 core_tx_ap_enqueue_warn_trigger;

	u32 core_tx_ap_enqueue_mcast;

	u32 core_tx_ap_enqueue_ucast;

	u32 core_tx_ap_enqueue;

	u32 intf_tx;

	u32 intf_tx_pending_ac;

	u32 intf_tx_pending_fw_under_survey;

	u32 intf_tx_pending_fw_under_linking;

	u32 intf_tx_pending_xmitbuf;

	u32 intf_tx_enqueue;

	u32 core_tx_enqueue;

	u32 core_tx_enqueue_class;

	u32 core_tx_enqueue_class_err_sta;

	u32 core_tx_enqueue_class_err_nosta;

	u32 core_tx_enqueue_class_err_fwlink;

	u32 intf_tx_direct;

	u32 intf_tx_direct_err_coalesce;

	u32 intf_tx_dequeue;

	u32 intf_tx_dequeue_err_coalesce;

	u32 intf_tx_dump_xframe;

	u32 intf_tx_dump_xframe_err_txdesc;

	u32 intf_tx_dump_xframe_err_port;

};



struct int_logs {

	u32 all;

	u32 err;

	u32 tbdok;

	u32 tbder;

	u32 bcnderr;

	u32 bcndma;

	u32 bcndma_e;

	u32 rx;

	u32 rx_rdu;

	u32 rx_fovw;

	u32 txfovw;

	u32 mgntok;

	u32 highdok;

	u32 bkdok;

	u32 bedok;

	u32 vidok;

	u32 vodok;

};



#endif /*  CONFIG_DBG_COUNTER */



struct debug_priv {

	u32 dbg_sdio_free_irq_error_cnt;

	u32 dbg_sdio_alloc_irq_error_cnt;
@@ -608,12 +483,6 @@ struct adapter { 
	u8 driver_rx_ampdu_factor;/* 0xff: disable drv ctrl, 0:8k, 1:16k, 2:32k, 3:64k; */



	unsigned char     in_cta_test;



#ifdef CONFIG_DBG_COUNTER

	struct rx_logs rx_logs;

	struct tx_logs tx_logs;

	struct int_logs int_logs;

#endif

};



#define adapter_to_dvobj(adapter) (adapter->dvobj)