wifi: iwlwifi: cfg: remove IWL_DEVICE_BZ_COMMON macro

We only have a single use of this inside the IWL_DEVICE_BZ
macro, so just combine the contents here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20220906161827.23d6c92e9a11.I4a11928a6d698079dc742e3ba3d3ce6fd7a878d1@changeid
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index c949675..110fda6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -249,7 +249,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
                },                                                      \
        }
 
-#define IWL_DEVICE_BZ_COMMON                                           \
+#define IWL_DEVICE_BZ                                                  \
        .ucode_api_max = IWL_22000_UCODE_API_MAX,                       \
        .ucode_api_min = IWL_22000_UCODE_API_MIN,                       \
        .led_mode = IWL_LED_RF_STATE,                                   \
@@ -285,16 +285,13 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
                        .addr = LDBG_M2S_BUF_WRAP_CNT,                  \
                        .mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,          \
                },                                                      \
-       }
-
-#define IWL_DEVICE_BZ                                                  \
-       IWL_DEVICE_BZ_COMMON,                                           \
+       },                                                              \
        .trans.umac_prph_offset = 0x300000,                             \
        .trans.device_family = IWL_DEVICE_FAMILY_BZ,                    \
        .trans.base_params = &iwl_ax210_base_params,                    \
        .min_txq_size = 128,                                            \
        .gp2_reg_addr = 0xd02c68,                                       \
-       .min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,          \
+       .min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,                  \
        .mon_dram_regs = {                                              \
                .write_ptr = {                                          \
                        .addr = DBGC_CUR_DBGBUF_STATUS,                 \