diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2021-10-24 16:55:00 +0300 |
|---|---|---|
| committer |   Luca Coelho <luciano.coelho@intel.com> | 2021-10-28 12:04:09 +0300 |
| commit | 2270bb685c913ac076aff835ff8ba53ee36ae70d (patch) | |
| tree | 135a5a39c9c0103a5f6d552e1d090b08b9e36840 /drivers/net/wireless/intel/iwlwifi/pcie/drv.c | |
| parent | iwlwifi: pcie: refactor dev_info lookup (diff) | |
| download | linux-dev-2270bb685c913ac076aff835ff8ba53ee36ae70d.tar.xz linux-dev-2270bb685c913ac076aff835ff8ba53ee36ae70d.zip | |
iwlwifi: pcie: remove two duplicate PNJ device entries
Since PNJ and TH have the same ID (0x32), there are duplicate
entries. Remove the duplicates with PNJ since PNJ is only the
test device in the first place.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211024165252.0ca7c9322e69.Id2f32427795d0713fd7d2722567e604808b219dd@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie/drv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index adb3ad26b712..ab7a1a090b36 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -726,17 +726,6 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { iwl9260_2ac_cfg, iwl9462_name), _IWL_DEV_INFO(0x2526, IWL_CFG_ANY, - IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY, - IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF, - IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, - iwl9260_2ac_cfg, iwl9560_160_name), - _IWL_DEV_INFO(0x2526, IWL_CFG_ANY, - IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY, - IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF, - IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, - iwl9260_2ac_cfg, iwl9560_name), - - _IWL_DEV_INFO(0x2526, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY, IWL_CFG_160, IWL_CFG_CORES_BT_GNSS, IWL_CFG_NO_CDB, |