staging: wfx: remove unused definitions from the hif API

Until now, hif API was directly imported from firmware sources.
However, it does not make sense to keep ton of unused structures in
the driver. Moreover, the hif API is now stable enough to be keep in
sync by importing delta from firmware.

So, drop unused definitions from the hif API.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200406111756.154086-5-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index f6934598f3198244bc7dabcf68022791f575cded..321f4fb27b35826534565f76339cd4198e2e7445 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -10,8 +10,6 @@
 
 #include "hif_api_general.h"
 
-#define HIF_NUM_AC                             4
-
 #define HIF_API_SSID_SIZE                      API_SSID_SIZE
 
 enum hif_requests_ids {
@@ -168,22 +166,6 @@ struct hif_ssid_def {
 #define HIF_API_MAX_NB_SSIDS                           2
 #define HIF_API_MAX_NB_CHANNELS                       14
 
-struct hif_req_start_scan {
-       u8    band;
-       struct hif_scan_type scan_type;
-       struct hif_scan_flags scan_flags;
-       u8    max_transmit_rate;
-       struct hif_auto_scan_param auto_scan_param;
-       u8    num_of_probe_requests;
-       u8    probe_delay;
-       u8    num_of_ssids;
-       u8    num_of_channels;
-       u32   min_channel_time;
-       u32   max_channel_time;
-       s32    tx_power_level;
-       u8    ssid_and_channel_lists[];
-} __packed;
-
 struct hif_req_start_scan_alt {
        u8    band;
        struct hif_scan_type scan_type;

diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h
index a069c3a21b4d421f2c671f36c9f64efd917ae848..73016135f538b44a1dd170cc635c357e015d5069 100644 (file)
--- a/drivers/staging/wfx/hif_api_general.h
+++ b/drivers/staging/wfx/hif_api_general.h
@@ -191,12 +191,6 @@ struct hif_req_control_gpio {
        u8 gpio_mode;
 } __packed;
 
-enum hif_gpio_error {
-       HIF_GPIO_ERROR_0                            = 0x0,
-       HIF_GPIO_ERROR_1                            = 0x1,
-       HIF_GPIO_ERROR_2                            = 0x2
-};
-
 struct hif_cnf_control_gpio {
        u32 status;
        u32 value;
@@ -350,88 +344,4 @@ struct hif_cnf_sl_configure {
        u32 status;
 } __packed;
 
-struct hif_req_prevent_rollback {
-       u32   magic_word;
-} __packed;
-
-struct hif_cnf_prevent_rollback {
-       u32    status;
-} __packed;
-
-enum hif_pta_mode {
-       PTA_1W_WLAN_MASTER = 0,
-       PTA_1W_COEX_MASTER = 1,
-       PTA_2W             = 2,
-       PTA_3W             = 3,
-       PTA_4W             = 4
-};
-
-enum hif_signal_level {
-       SIGNAL_LOW  = 0,
-       SIGNAL_HIGH = 1
-};
-
-enum hif_coex_type {
-       COEX_TYPE_GENERIC = 0,
-       COEX_TYPE_BLE     = 1
-};
-
-enum hif_grant_state {
-       NO_GRANT = 0,
-       GRANT    = 1
-};
-
-struct hif_req_pta_settings {
-       u8 pta_mode;
-       u8 request_signal_active_level;
-       u8 priority_signal_active_level;
-       u8 freq_signal_active_level;
-       u8 grant_signal_active_level;
-       u8 coex_type;
-       u8 default_grant_state;
-       u8 simultaneous_rx_accesses;
-       u8 priority_sampling_time;
-       u8 tx_rx_sampling_time;
-       u8 freq_sampling_time;
-       u8 grant_valid_time;
-       u8 fem_control_time;
-       u8 first_slot_time;
-       u16 periodic_tx_rx_sampling_time;
-       u16 coex_quota;
-       u16 wlan_quota;
-} __packed;
-
-struct hif_cnf_pta_settings {
-       u32 status;
-} __packed;
-
-enum hif_pta_priority {
-       HIF_PTA_PRIORITY_COEX_MAXIMIZED = 0x00000562,
-       HIF_PTA_PRIORITY_COEX_HIGH      = 0x00000462,
-       HIF_PTA_PRIORITY_BALANCED       = 0x00001461,
-       HIF_PTA_PRIORITY_WLAN_HIGH      = 0x00001851,
-       HIF_PTA_PRIORITY_WLAN_MAXIMIZED = 0x00001A51
-};
-
-struct hif_req_pta_priority {
-       u32 priority;
-} __packed;
-
-struct hif_cnf_pta_priority {
-       u32 status;
-} __packed;
-
-enum hif_pta_state {
-       PTA_OFF = 0,
-       PTA_ON  = 1
-};
-
-struct hif_req_pta_state {
-       u32 pta_state;
-} __packed;
-
-struct hif_cnf_pta_state {
-       u32 status;
-} __packed;
-
 #endif

diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h
index 36c9152785c4bb96cd4e957dd462e45532b179cb..732f82d10a19b1961289259351772f831ebe5a98 100644 (file)
--- a/drivers/staging/wfx/hif_api_mib.h
+++ b/drivers/staging/wfx/hif_api_mib.h
@@ -63,8 +63,6 @@ enum hif_mib_ids {
        HIF_MIB_ID_BEACON_STATS                    = 0x2056,
 };
 
-#define HIF_OP_POWER_MODE_MASK                     0xf
-
 enum hif_op_power_mode {
        HIF_OP_POWER_MODE_ACTIVE                   = 0x0,
        HIF_OP_POWER_MODE_DOZE                     = 0x1,
@@ -78,78 +76,12 @@ struct hif_mib_gl_operational_power_mode {
        u8    reserved2[3];
 } __packed;
 
-struct hif_mib_gl_block_ack_info {
-       u8    rx_buffer_size;
-       u8    rx_max_num_agreements;
-       u8    tx_buffer_size;
-       u8    tx_max_num_agreements;
-} __packed;
-
 struct hif_mib_gl_set_multi_msg {
        u8    enable_multi_tx_conf:1;
        u8    reserved1:7;
        u8    reserved2[3];
 } __packed;
 
-enum hif_cca_thr_mode {
-       HIF_CCA_THR_MODE_RELATIVE = 0x0,
-       HIF_CCA_THR_MODE_ABSOLUTE = 0x1
-};
-
-struct hif_mib_gl_cca_config {
-       u8  cca_thr_mode;
-       u8  reserved[3];
-} __packed;
-
-#define MAX_NUMBER_DATA_FILTERS             0xA
-
-#define MAX_NUMBER_IPV4_ADDR_CONDITIONS     0x4
-#define MAX_NUMBER_IPV6_ADDR_CONDITIONS     0x4
-#define MAX_NUMBER_MAC_ADDR_CONDITIONS      0x4
-#define MAX_NUMBER_UC_MC_BC_CONDITIONS      0x4
-#define MAX_NUMBER_ETHER_TYPE_CONDITIONS    0x4
-#define MAX_NUMBER_PORT_CONDITIONS          0x4
-#define MAX_NUMBER_MAGIC_CONDITIONS         0x4
-#define MAX_NUMBER_ARP_CONDITIONS           0x2
-#define MAX_NUMBER_NS_CONDITIONS            0x2
-
-struct hif_mib_ethertype_data_frame_condition {
-       u8    condition_idx;
-       u8    reserved;
-       u16   ether_type;
-} __packed;
-
-enum hif_udp_tcp_protocol {
-       HIF_PROTOCOL_UDP                       = 0x0,
-       HIF_PROTOCOL_TCP                       = 0x1,
-       HIF_PROTOCOL_BOTH_UDP_TCP              = 0x2
-};
-
-enum hif_which_port {
-       HIF_PORT_DST                           = 0x0,
-       HIF_PORT_SRC                           = 0x1,
-       HIF_PORT_SRC_OR_DST                    = 0x2
-};
-
-struct hif_mib_ports_data_frame_condition {
-       u8    condition_idx;
-       u8    protocol;
-       u8    which_port;
-       u8    reserved1;
-       u16   port_number;
-       u8    reserved2[2];
-} __packed;
-
-#define HIF_API_MAGIC_PATTERN_SIZE                 32
-
-struct hif_mib_magic_data_frame_condition {
-       u8    condition_idx;
-       u8    offset;
-       u8    magic_pattern_length;
-       u8    reserved;
-       u8    magic_pattern[HIF_API_MAGIC_PATTERN_SIZE];
-} __packed;
-
 enum hif_mac_addr_type {
        HIF_MAC_ADDR_A1                            = 0x0,
        HIF_MAC_ADDR_A2                            = 0x1,
@@ -162,25 +94,6 @@ struct hif_mib_mac_addr_data_frame_condition {
        u8    mac_address[ETH_ALEN];
 } __packed;
 
-enum hif_ip_addr_mode {
-       HIF_IP_ADDR_SRC                            = 0x0,
-       HIF_IP_ADDR_DST                            = 0x1
-};
-
-struct hif_mib_ipv4_addr_data_frame_condition {
-       u8    condition_idx;
-       u8    address_mode;
-       u8    reserved[2];
-       u8    i_pv4_address[HIF_API_IPV4_ADDRESS_SIZE];
-} __packed;
-
-struct hif_mib_ipv6_addr_data_frame_condition {
-       u8    condition_idx;
-       u8    address_mode;
-       u8    reserved[2];
-       u8    i_pv6_address[HIF_API_IPV6_ADDRESS_SIZE];
-} __packed;
-
 #define HIF_FILTER_UNICAST   0x1
 #define HIF_FILTER_MULTICAST 0x2
 #define HIF_FILTER_BROADCAST 0x4
@@ -226,13 +139,6 @@ struct hif_mib_arp_ip_addr_table {
        u8    ipv4_address[HIF_API_IPV4_ADDRESS_SIZE];
 } __packed;
 
-struct hif_mib_ns_ip_addr_table {
-       u8    condition_idx;
-       u8    ns_enable;
-       u8    reserved[2];
-       u8    ipv6_address[HIF_API_IPV6_ADDRESS_SIZE];
-} __packed;
-
 struct hif_mib_rx_filter {
        u8    reserved1:1;
        u8    bssid_filter:1;
@@ -273,23 +179,6 @@ struct hif_mib_bcn_filter_enable {
        u32   bcn_count;
 } __packed;
 
-struct hif_mib_group_seq_counter {
-       u32   bits4716;
-       u16   bits1500;
-       u16   reserved;
-} __packed;
-
-struct hif_mib_tsf_counter {
-       u32   tsf_counterlo;
-       u32   tsf_counterhi;
-} __packed;
-
-struct hif_mib_stats_table {
-       s16    latest_snr;
-       u8    latest_rcpi;
-       s8     latest_rssi;
-} __packed;
-
 struct hif_mib_extended_count_table {
        u32   count_plcp_errors;
        u32   count_fcs_errors;
@@ -345,29 +234,11 @@ struct hif_mib_count_table {
        u32   count_rx_bipmic_errors;
 } __packed;
 
-struct hif_mib_max_tx_power_level {
-       s32       max_tx_power_level_rf_port1;
-       s32       max_tx_power_level_rf_port2;
-} __packed;
-
-struct hif_mib_beacon_stats {
-       s32     latest_tbtt_diff;
-       u32    reserved[4];
-} __packed;
-
 struct hif_mib_mac_address {
        u8    mac_addr[ETH_ALEN];
        u16   reserved;
 } __packed;
 
-struct hif_mib_dot11_max_transmit_msdu_lifetime {
-       u32   max_life_time;
-} __packed;
-
-struct hif_mib_dot11_max_receive_lifetime {
-       u32   max_life_time;
-} __packed;
-
 struct hif_mib_wep_default_key_id {
        u8    wep_default_key_id;
        u8    reserved[3];
@@ -440,12 +311,6 @@ struct hif_mib_block_ack_policy {
        u8    block_ack_rx_max_buffer_size;
 } __packed;
 
-struct hif_mib_override_int_rate {
-       u8    internal_tx_rate;
-       u8    non_erp_internal_tx_rate;
-       u8    reserved[2];
-} __packed;
-
 enum hif_mpdu_start_spacing {
        HIF_MPDU_START_SPACING_NO_RESTRIC          = 0x0,
        HIF_MPDU_START_SPACING_QUARTER             = 0x1,
@@ -528,24 +393,4 @@ struct hif_mib_keep_alive_period {
        u8    reserved[2];
 } __packed;
 
-struct hif_mib_arp_keep_alive_period {
-       u16   arp_keep_alive_period;
-       u8    encr_type;
-       u8    reserved;
-       u8    sender_ipv4_address[HIF_API_IPV4_ADDRESS_SIZE];
-       u8    target_ipv4_address[HIF_API_IPV4_ADDRESS_SIZE];
-} __packed;
-
-struct hif_mib_inactivity_timer {
-       u8    min_active_time;
-       u8    max_active_time;
-       u16   reserved;
-} __packed;
-
-struct hif_mib_interface_protection {
-       u8   use_cts_prot:1;
-       u8   reserved1:7;
-       u8   reserved2[3];
-} __packed;
-
 #endif