From patchwork Wed Jul 22 18:16:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 6845761 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB648C05AC for ; Wed, 22 Jul 2015 18:17:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1491D204A7 for ; Wed, 22 Jul 2015 18:17:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DE6320499 for ; Wed, 22 Jul 2015 18:17:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752701AbbGVSRq (ORCPT ); Wed, 22 Jul 2015 14:17:46 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:33318 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752691AbbGVSRo (ORCPT ); Wed, 22 Jul 2015 14:17:44 -0400 Received: by wicmv11 with SMTP id mv11so92400662wic.0 for ; Wed, 22 Jul 2015 11:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C7f2hVg6rUx5LWcIMe7LVl6WEe0x3h7H0CG+4ADP3+4=; b=YnN7E7hbIe0QYhCOPVc3yoVaLKCKxMipzH5yb3/a4Rv5BM6QoLmEt9tWQ7uyEQP5pn NbSn9+/NgiQdBoxWzJgsStNt8eREP7hBTH14mTUfGLbFeNqG0qh+GFKsOupRBcK3ugUj 584ZMT/4bQP/LyGHjt/nXRhE4hcmiuAfLuyunKhiZSjVyNMaCsUR8ennPC52pGQB0Dhl 4Fv6qFGjVRBjRDWToIe3fuf/xXDsFKIANOJh51i7Zg6g1L7UIyRK3K5EyGItuYdrNPmU ty1AYJShYezkHW/KfOJD3VKtFv9JSwt8pKEE0PAjeEmzuWrOgrHaxo2JZIWJKlFEmLb2 ddow== X-Received: by 10.180.73.200 with SMTP id n8mr44539347wiv.94.1437589063069; Wed, 22 Jul 2015 11:17:43 -0700 (PDT) Received: from tipsey.3.home (188.30.183.207.threembb.co.uk. [188.30.183.207]) by smtp.gmail.com with ESMTPSA id ha4sm23219334wib.0.2015.07.22.11.17.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jul 2015 11:17:05 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 04/15] staging: vt6655: remove unnecessary variable skb_dma Date: Wed, 22 Jul 2015 19:16:36 +0100 Message-Id: <1437589007-5479-4-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437589007-5479-1-git-send-email-tvboxspy@gmail.com> References: <1437589007-5479-1-git-send-email-tvboxspy@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP skb_dma flips from 0 to the contents buf_dma. This is nolonger necessary so use buf_dma directly and remove skb_dma altogether. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/desc.h | 1 - drivers/staging/vt6655/device_main.c | 3 +-- drivers/staging/vt6655/rxtx.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 758eeb2..d568101 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -256,7 +256,6 @@ typedef struct tagDEVICE_TD_INFO { void *mic_hdr; struct sk_buff *skb; unsigned char *buf; - dma_addr_t skb_dma; dma_addr_t buf_dma; dma_addr_t curr_desc; unsigned long dwReqCount; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 695aa25..89611a7 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -970,7 +970,6 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc) if (skb) ieee80211_tx_status_irqsafe(pDevice->hw, skb); - pTDInfo->skb_dma = 0; pTDInfo->skb = NULL; pTDInfo->byFlags = 0; } @@ -1201,7 +1200,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) head_td->m_td1TD1.wReqCount = cpu_to_le16((u16)head_td->pTDInfo->dwReqCount); - head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->skb_dma); + head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->buf_dma); /* Poll Transmit the adapter */ wmb(); diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 0ffa9bf..82380f3 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1202,7 +1202,6 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, ptdCurr->pTDInfo->dwReqCount = cbReqCount; ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength; - ptdCurr->pTDInfo->skb_dma = ptdCurr->pTDInfo->buf_dma; return cbHeaderLength; }