Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp820291ybz; Fri, 24 Apr 2020 09:48:44 -0700 (PDT) X-Google-Smtp-Source: APiQypJMEjHqLd4gCVEjZucX0Jz3O9K/reyiBbWqOKR/vU6HeTuBJ6DpbUSKqdtLqoUOtpxG2o+m X-Received: by 2002:a17:906:468c:: with SMTP id a12mr8287396ejr.149.1587746924629; Fri, 24 Apr 2020 09:48:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587746924; cv=none; d=google.com; s=arc-20160816; b=0gAFiGdjQ6iRzw64ebBBSd9cvuI/X2H982XGuC3/aFGkMylvr3u6UAOSm68bf1hkIk ez0hXEb9rqep4xOhdRnAlFmNW9JRGdRNDxE2oewEVdIfrZ+Za6cyI5u5yPojZQ4ILe4j quA09NyfMSoV2hK5p79BENCZTiI0eLsu+F4AuNIGG8YJmkTo1Z3QEvB/HyZurwF4s6NC 5VfvNrDSXyWAAje98QXfnigjN+B9Pkjpa4+sptaswOwM+tL0GQJNZVYl6cdwTmB5WQzJ 6DEoDu5I9p9bvdKeFfdXVqLD29Ki5+NvFYVXZXH9ptlAej2LIHYCWda3tJw/ZqVsKC6p eaZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from; bh=GWN2gh9TypSbBgh/2V58lvbeqD53dHIAfoTudNZ4Tak=; b=x+QHOG6lX8ONj3y5WvYFn3KnH9YwkGtXAzATTQ8N3ApMWUY3RrRwESXFWHqUCwqCiM 7kUS67sC9I8wpG5Jc4DYeXl8Ufh0BorfcPVdd0B85s8AtC5nLwz8TaVmV8hUrOWlEjDp EtxWUqj0adNqW5XwubjJuhWdQlO8If/WNyJTc7x1zE5jfJ/DQ1KWe0fJwADBB5HVlEmm 3cmLttTaCOtFzdzvMMAde+56a4KXy+jepnJO7STZRD/aM7baqoCK+MjkPUpC8YBl1hyB 2553FNw4XqCZqxYjdbMJAfCE4dSxvckueJELaidyGAEeKxvvFF4O0p9hNCQreXaOVA7f QIbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i8si3376948edy.253.2020.04.24.09.47.49; Fri, 24 Apr 2020 09:48:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728709AbgDXQr2 (ORCPT + 99 others); Fri, 24 Apr 2020 12:47:28 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:58016 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728634AbgDXQr2 (ORCPT ); Fri, 24 Apr 2020 12:47:28 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jS1U4-000OcH-VQ; Fri, 24 Apr 2020 19:47:25 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Fri, 24 Apr 2020 19:47:03 +0300 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200424164707.2715869-1-luca@coelho.fi> References: <20200424164707.2715869-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH 07/11] iwlwifi: pcie: remove mangling for iwl_ax101_cfg_qu_hr Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Luca Coelho All devices that use iwl_ax101_cfg_qu_hr are recognized via the device info table, so the cfg will never be iwl_ax101_cfg_qu_hr. Remove the code that converts this into QuZ and Qu-C, since it's not needed anymore. Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 5c216fa6505c..4146526b1278 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1062,29 +1062,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF4)) { iwl_trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0; } - } else if (cfg == &iwl_ax101_cfg_qu_hr) { - if ((CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == - CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) && - iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) || - (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == - CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR1))) { - iwl_trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0; - } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == - CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) && - iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) { - iwl_trans->cfg = &iwl_ax101_cfg_quz_hr; - } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == - CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) { - iwl_trans->cfg = &iwl_ax101_cfg_qu_hr; - } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == - CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HRCDB)) { - IWL_ERR(iwl_trans, "RF ID HRCDB is not supported\n"); - return -EINVAL; - } else { - IWL_ERR(iwl_trans, "Unrecognized RF ID 0x%08x\n", - CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id)); - return -EINVAL; - } } /* -- 2.26.2