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>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index adb3ad26b712e3b8cd8439a6bd55cf278f7f6c66..ab7a1a090b36333bf8e4d7b21b399385d268eb2b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -725,17 +725,6 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
                      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
                      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,