diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-04-19 12:22:10 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2023-04-20 09:24:33 +0000 |
| commit | 1ec9f9d320b5dd7fd4f0c53bc087858da5cc1aec (patch) | |
| tree | dae1ad0384899263d1998872cc32c3d895cdc888 | |
| parent | 9f083c164943f39227500361043951dc54483ab2 (diff) | |
| download | backport-iwlwifi-1ec9f9d320b5dd7fd4f0c53bc087858da5cc1aec.tar.gz | |
wifi: iwlwifi: pcie: remove BnJ/SnJ workaround
Remove the PCI ID workaround for handling the same
PCI ID for SnJ/BnJ here since we no longer have the
code to support these devices.
type=cleanup
ticket=none
Change-Id: Ieada6dabddf1bd93ab217f9c6884a3220e276c8f
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/51887
automatic-review: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Greenman, Gregory <gregory.greenman@intel.com>
x-iwlwifi-stack-dev: c534eec8c28052dc831f264819362ab0b2043f5d
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 11 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 55eaa4278b..bf97b4dbc8 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1138,17 +1138,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) trans_pcie = IWL_TRANS_GET_PCIE_TRANS(iwl_trans); -#if IS_ENABLED(CPTCFG_IWLMVM) - /* BnJ and SnJ devices have the same device id 0x2726; they can be - * differentiated by MAC type. SnJ device is registered by default, use - * MAC type here to distinguish between them. In case it is GL MAC type, - * replace trans_cfg accordingly. - */ - if (pdev->device == 0x2726 && - (CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_GL)) - iwl_trans->trans_cfg = &iwl_bz_trans_cfg; -#endif - /* * Let's try to grab NIC access early here. Sometimes, NICs may * fail to initialize, and if that happens it's better if we see @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11164:62c707b8" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11165:c534eec8" |