From patchwork Thu Dec 4 22:05:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 417941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 370601400D2; Fri, 5 Dec 2014 09:06:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XweXn-00070X-4d; Thu, 04 Dec 2014 22:06:39 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XweXD-0006nC-Tc for kernel-team@lists.ubuntu.com; Thu, 04 Dec 2014 22:06:04 +0000 Received: by mail-ob0-f177.google.com with SMTP id va2so3463501obc.36 for ; Thu, 04 Dec 2014 14:06:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=uh6MlcqnlonAWGbg3P1j9NVbcYbQXcLX6CG6w45dGc8=; b=JSd0HffsQ27UkGE97AoeUOzTZBosanJmLYkl0O7cEZ/pMgtakjJmhFMBWnmRb8/nFt Swg3Dh/xfvZPYHc9nUsTQUbJFTQ34VtIfvD3oq0lA28g2GWJsDWR2Abx1Cci2boiaR2V Po4c2qdCRR9BWMA2BjSfLSJ8+dU7NVGwFna+6bpNvRoCkre5ytuzoPgc3Qg3HbetB8W5 zuyET5EbYPxZlV/fmiAbLSQ5ECimkIC8mZjJISkuzV7rXUzZm4ICOY6FTN39pRa1ZpVp zB2MBArvN2VIwIL8w3A0JJqfvzXTpLlFZNNxYIEgl3vSKB40+HI9fCGG3d6Kx7PLR8NC AhJg== X-Gm-Message-State: ALoCoQlScZlEhZTc9I9bXr+lKa0lrcM9xILjGqHd3O5eC6fZYFJbSBhW46dzVh+jpCptEcx58cjp X-Received: by 10.202.66.70 with SMTP id p67mr7844098oia.10.1417730763420; Thu, 04 Dec 2014 14:06:03 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by mx.google.com with ESMTPSA id u15sm3261549obg.28.2014.12.04.14.06.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Dec 2014 14:06:03 -0800 (PST) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/7][utopic SRU] iwlwifi: rename iwl_mvm_fw_error_next_data Date: Thu, 4 Dec 2014 16:05:37 -0600 Message-Id: <1417730742-38020-3-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417730742-38020-1-git-send-email-seth.forshee@canonical.com> References: <1417730742-38020-1-git-send-email-seth.forshee@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Emmanuel Grumbach commit 1fa1605648d15d42f350807279b6c6e8d33b6382 upstream. This is not related to mvm. Rename to iwl_fw_error_next_data. Signed-off-by: Emmanuel Grumbach BugLink: http://bugs.launchpad.net/bugs/1399440 Signed-off-by: Seth Forshee --- drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 4 ++-- drivers/net/wireless/iwlwifi/mvm/ops.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h index aa0f85e..3584a75 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h @@ -145,12 +145,12 @@ struct iwl_fw_error_dump_info { } __packed; /** - * iwl_mvm_fw_error_next_data - advance fw error dump data pointer + * iwl_fw_error_next_data - advance fw error dump data pointer * @data: previous data block * Returns: next data block */ static inline struct iwl_fw_error_dump_data * -iwl_mvm_fw_error_next_data(struct iwl_fw_error_dump_data *data) +iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data) { return (void *)(data->data + le32_to_cpu(data->len)); } diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c index 1900c33..19aea4a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/iwlwifi/mvm/ops.c @@ -870,12 +870,12 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) strncpy(dump_info->bus_human_readable, mvm->dev->bus->name, sizeof(dump_info->bus_human_readable)); - dump_data = iwl_mvm_fw_error_next_data(dump_data); + dump_data = iwl_fw_error_next_data(dump_data); dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_RXF); dump_data->len = cpu_to_le32(mvm->fw_error_rxf_len); memcpy(dump_data->data, mvm->fw_error_rxf, mvm->fw_error_rxf_len); - dump_data = iwl_mvm_fw_error_next_data(dump_data); + dump_data = iwl_fw_error_next_data(dump_data); dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_SRAM); dump_data->len = cpu_to_le32(mvm->fw_error_sram_len); @@ -895,7 +895,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) mvm->fw_error_sram_len = 0; if (trans_len) { - void *buf = iwl_mvm_fw_error_next_data(dump_data); + void *buf = iwl_fw_error_next_data(dump_data); u32 real_trans_len = iwl_trans_dump_data(mvm->trans, buf, trans_len); dump_data = (void *)((u8 *)buf + real_trans_len);