Commit 7f0d5a32 authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: cfg: remove iwl_cfg_br 



This is the same as iwl_cfg_dr, just different by the MAC,
so no need to keep a separate config; remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502155404.83b86e8a182b.Iec7f3027e7058005a98ff6d05cc224ab61b7c44a@changeid
parent cfbe1f27

drivers/net/wireless/intel/iwlwifi/cfg/dr.c

+0 −4
Original line number Diff line number Diff line
@@ -154,10 +154,6 @@ const struct iwl_cfg_trans_params iwl_br_trans_cfg = { 


const char iwl_br_name[] = "Intel(R) TBD Br device";



const struct iwl_cfg iwl_cfg_br = {

	IWL_DEVICE_DR,

};



MODULE_FIRMWARE(IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BR_A_PET_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −1
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ extern const struct iwl_cfg iwl_cfg_bz; 


extern const struct iwl_cfg iwl_cfg_sc;

extern const struct iwl_cfg iwl_cfg_dr;

extern const struct iwl_cfg iwl_cfg_br;

#endif /* CONFIG_IWLMLD */



#endif /* __IWL_CONFIG_H__ */

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
	IWL_DEV_INFO(iwl_cfg_dr, iwl_dr_name, MAC_TYPE(DR)),



/* Br */

	IWL_DEV_INFO(iwl_cfg_br, iwl_br_name, MAC_TYPE(BR)),

	IWL_DEV_INFO(iwl_cfg_dr, iwl_br_name, MAC_TYPE(BR)),

#endif /* CONFIG_IWLMLD */

};

EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table);