Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1457567ybz; Sat, 18 Apr 2020 01:10:15 -0700 (PDT) X-Google-Smtp-Source: APiQypK8yBWfpEtDI5aQbM7wAKDF4n21uVLYnYidfYjbEKEzi8f0DJ5hsgkVIcYTt18sDam7PY+b X-Received: by 2002:a17:906:1d4c:: with SMTP id o12mr615590ejh.357.1587197415449; Sat, 18 Apr 2020 01:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587197415; cv=none; d=google.com; s=arc-20160816; b=TBsfxyxXLj8caZvnHSm5sp2L+Sbt8xlwyIlAgwU4US6y2t2U8VZie1BEHa8w9Noq63 6pG5xBDlGAV0sv8cjAlsk4QPJwh+UykfWOZSfsNhc5V25YY64Sijx/av14J5KdfyayMw f1QAzanfuEtO1QcWmLoZK6Cvb9Qscj3IchaHGxOwoskJTEifE5yWX7a/+8xRShhaShhz pPY3UCvPFx11ayV0p21BHlrxM7T0b4yPFSaMPgsd0DIAnU9KvWCoNaYv9zSZzwj9MIXb owj13eoH5V3/FDGyuZ/G2opal8JmKs+hYFtjCpaW7eWxUJXvDRqeaxkUfKi9oO/YrMiV kFYA== 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=I8YJquSUHDiG/vjsaknfWYv/ggUf+QT6WT8dwVcQQ7o=; b=0jwPmdEsPGyy8bjRSs4se2a4HxDnbJA9uybllFzM17Sai4c7md1fRpJaYajm1DXRet qWuBT1YPVxkmIRUdmIhUQwwXiCXoZqBCYuCFFCqfJTGwepH5cmLcF/XjRuGsBH7xWPVT PcBFlvf1xUhpd3LtQLsb4jTn04am04LA15ii8YwJffzofX/xn7of4Rw/vfxPMDF2fM/n WmAvZMsoHOtnYezIT/bkcJTXtESVUjZVWcXLDn3gqb4nmDFSTMN0PzF2CNNbjfC3A3/Y OI6UZ1xAor2JEQYzswALQe+khmfXDH/tKGBPGuBcUkIogNy+fpxG9zZRoKsKWW8E8j1J h6yg== 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 b26si11147418edr.228.2020.04.18.01.09.52; Sat, 18 Apr 2020 01:10:15 -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 S1726049AbgDRIJV (ORCPT + 99 others); Sat, 18 Apr 2020 04:09:21 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:56740 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725856AbgDRIJS (ORCPT ); Sat, 18 Apr 2020 04:09:18 -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 1jPiXK-000L3r-8F; Sat, 18 Apr 2020 11:09:14 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Sat, 18 Apr 2020 11:08:46 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200418080857.2232093-1-luca@coelho.fi> References: <20200418080857.2232093-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 01/12] iwlwifi: pcie: move iwl_pcie_ctxt_info_alloc_dma() to user Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg There's no need for this to be an inline in the header file, only the context-info.c file ever uses it. Move it there. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 15 +++++++++++++++ .../net/wireless/intel/iwlwifi/pcie/internal.h | 16 ---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c index acd01d86f101..b65405009d02 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c @@ -93,6 +93,21 @@ static void *iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans, return _iwl_pcie_ctxt_info_dma_alloc_coherent(trans, size, phys, 0); } +static int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans, + const struct fw_desc *sec, + struct iwl_dram_data *dram) +{ + dram->block = iwl_pcie_ctxt_info_dma_alloc_coherent(trans, sec->len, + &dram->physical); + if (!dram->block) + return -ENOMEM; + + dram->size = sec->len; + memcpy(dram->block, sec->data, sec->len); + + return 0; +} + void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans) { struct iwl_self_init_dram *dram = &trans->init_dram; diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h index 595e6873d56e..abe649af689c 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h @@ -792,22 +792,6 @@ static inline int iwl_pcie_get_num_sections(const struct fw_img *fw, return i; } -static inline int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans, - const struct fw_desc *sec, - struct iwl_dram_data *dram) -{ - dram->block = dma_alloc_coherent(trans->dev, sec->len, - &dram->physical, - GFP_KERNEL); - if (!dram->block) - return -ENOMEM; - - dram->size = sec->len; - memcpy(dram->block, sec->data, sec->len); - - return 0; -} - static inline void iwl_pcie_ctxt_info_free_fw_img(struct iwl_trans *trans) { struct iwl_self_init_dram *dram = &trans->init_dram; -- 2.25.1