iwlwifi: remove trans entries from COMMON 9260 macro

These entries are decided at runtime using the new parameters now, so
they are not needed in the macro that is reused in the configs.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200309091348.3387a6c8fdbe.I98284457f26c5695754964b28f0257a7dc7c6b1c@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index 9fcc1d97d6b7dbf511ad09a890b895e1095f906a..d02936a8e11d60e58b60d434ed0e2084f59f147a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -123,8 +123,6 @@ static const struct iwl_tt_params iwl9000_tt_params = {
 #define IWL_DEVICE_9000                                                        \
        .ucode_api_max = IWL9000_UCODE_API_MAX,                         \
        .ucode_api_min = IWL9000_UCODE_API_MIN,                         \
-       .trans.device_family = IWL_DEVICE_FAMILY_9000,                  \
-       .trans.base_params = &iwl9000_base_params,                      \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .nvm_hw_section_num = 10,                                       \
        .non_shared_ant = ANT_B,                                        \
@@ -137,11 +135,9 @@ static const struct iwl_tt_params iwl9000_tt_params = {
        .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,           \
        .thermal_params = &iwl9000_tt_params,                           \
        .apmg_not_supported = true,                                     \
-       .trans.mq_rx_supported = true,                                  \
        .num_rbds = 512,                                                \
        .vht_mu_mimo_supported = true,                                  \
        .mac_addr_from_csr = true,                                      \
-       .trans.rf_id = true,                                            \
        .nvm_type = IWL_NVM_EXT,                                        \
        .dbgc_supported = true,                                         \
        .min_umac_error_event_table = 0x800000,                         \