Commit 3fa1bd49 authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: cfg: remove duplicated iwl_cfg_gl 



This really is the same device as covered by iwl_cfg_bz,
just the discrete version. Since discrete vs integrated
is handled in the transport config, there's no need to
have both. Remove iwl_cfg_gl.

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/20250502151751.fbb78183dc85.Ic5429009677ae1023cf1f43a655e90409a30c493@changeid
parent d5b85293

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

+0 −7
Original line number Diff line number Diff line
@@ -169,13 +169,6 @@ const struct iwl_cfg iwl_cfg_bz = { 
	.num_rbds = IWL_NUM_RBDS_BZ_EHT,

};



const struct iwl_cfg iwl_cfg_gl = {

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_EHT,

};



MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_BZ_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_BZ_UCODE_API_MAX);

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

+0 −1
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0; 
extern const struct iwl_ht_params iwl_bz_ht_params;



extern const struct iwl_cfg iwl_cfg_bz;

extern const struct iwl_cfg iwl_cfg_gl;



extern const struct iwl_cfg iwl_cfg_sc;

extern const struct iwl_cfg iwl_cfg_sc2;

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

+2 −2
Original line number Diff line number Diff line
@@ -1120,9 +1120,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
	IWL_DEV_INFO(iwl_cfg_bz, iwl_wh_name, MAC_TYPE(BZ_W), RF_TYPE(WH)),



/* Ga (Gl) */

	IWL_DEV_INFO(iwl_cfg_gl, iwl_gl_name, MAC_TYPE(GL), RF_TYPE(FM),

	IWL_DEV_INFO(iwl_cfg_bz, iwl_gl_name, MAC_TYPE(GL), RF_TYPE(FM),

		     BW_NO_LIMIT, NO_CDB),

	IWL_DEV_INFO(iwl_cfg_gl, iwl_mtp_name, MAC_TYPE(GL), RF_TYPE(FM),

	IWL_DEV_INFO(iwl_cfg_bz, iwl_mtp_name, MAC_TYPE(GL), RF_TYPE(FM),

		     BW_LIMIT(160), NO_CDB),



/* Sc */