Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp436494pxt; Thu, 5 Aug 2021 03:28:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM3ypfLmC/3cDGtLOds8qw18C+KPECQJjKpVXG53c8AnHgQTMguJCMsqwJc0IT1iFMT3AI X-Received: by 2002:aa7:dbc3:: with SMTP id v3mr5567731edt.63.1628159324948; Thu, 05 Aug 2021 03:28:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628159324; cv=none; d=google.com; s=arc-20160816; b=VUcLqWDcHVayxtjwQPOELq0rthSbs8++CjH1TJ3VEVEBJpkk1Tr06Eqq4nBDYKzGiA 7NPFAQCwqwXZgyk+6zP0AlUOQnjW58Mks6OQaSUe38E42u8bWJcDmNa3Y16oR2M+InRE 8+fXfymT3Fj60YWgqIDUTpGOMP3cyojES8CX7Q0MCOTehNGv+C3/ycxhTSz3XfVHW1qh oDdFFS5C2HEH+JbUsnqOZftWEbwHGe3DJkWQzdtOvngcX7VVVx2bhqLhBh2PNi4Y9Zzy 7meNqnT+gGurzCMhh0LuIdQ4wfzO2LP4uKC/FC2cvr/1nJEh+djEYUEsOo4zW1lZ+WWP DKfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=cBwQcFzlViqPM4y7hY1SzDvGv2pmDVZL8RhnDfNhBXQ=; b=sq3lrjcdtEvploaLQrAAO6AbZccSaeQybuMzOwiiTKOnO7mIvbEz3DjFngFe0Y4XQA +FtWHYVVb2Tdh5lpw/5dDRT/1QwTwgijoIyBb2dXXChcKDa//XJbiwAIn5VyGYJbnsaQ 7oZEkmLg7Oht1jcLx6a25MWaVFmE4gP4j4d6o2F1Og2ei8s9NNJ3X8HvidYcSWusbJcT PIvF1qMah693m3YpEd+HqMTJ2VngNGec/BXtjTJ096k3YJKwPo3y/VMb5wxSBMdXlxb6 6Gf52HGFkQqoY8wo4TcqKElLDezZWhqL18NEFxRS0EN/PA9LxtGg2TXxxlQNtFdpDfU2 t9+g== 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 l15si5185706ejg.444.2021.08.05.03.28.21; Thu, 05 Aug 2021 03:28: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 S240315AbhHEK0P (ORCPT + 99 others); Thu, 5 Aug 2021 06:26:15 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:51262 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S239963AbhHEK0P (ORCPT ); Thu, 5 Aug 2021 06:26:15 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.lan) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1mBaTa-00240Q-ER; Thu, 05 Aug 2021 13:19:47 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Thu, 5 Aug 2021 13:19:34 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210805101934.431479-1-luca@coelho.fi> References: <20210805101934.431479-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) 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.5-pre1 Subject: [PATCH 12/12] iwlwifi: remove ACPI_SAR_NUM_TABLES definition Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Luca Coelho This definition was only used to pass the size of the tables in the FW API to the iwl_sar_select_profile() function, but we should actually pass the definition from the FW API file. We don't have the concept of tables in the ACPI definition, so we can remove it. Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 1 - drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h index cd26a155baf7..245f0646c8f8 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h @@ -34,7 +34,6 @@ #define ACPI_SAR_NUM_CHAINS 2 #define ACPI_SAR_NUM_SUB_BANDS 5 -#define ACPI_SAR_NUM_TABLES 1 #define ACPI_WRDS_WIFI_DATA_SIZE (ACPI_SAR_NUM_CHAINS * \ ACPI_SAR_NUM_SUB_BANDS + 2) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 38fd5886af2d..0b769aac0b02 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -743,7 +743,8 @@ int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b) /* all structs have the same common part, add it */ len += sizeof(cmd.common); - ret = iwl_sar_select_profile(&mvm->fwrt, per_chain, ACPI_SAR_NUM_TABLES, + ret = iwl_sar_select_profile(&mvm->fwrt, per_chain, + IWL_NUM_CHAIN_TABLES, n_subbands, prof_a, prof_b); /* return on error or if the profile is disabled (positive number) */ -- 2.32.0