From patchwork Sat Oct 3 19:30:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 7322321 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 3EF0DBEEA4 for ; Sat, 3 Oct 2015 19:30:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B31B2055C for ; Sat, 3 Oct 2015 19:30:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 937F520452 for ; Sat, 3 Oct 2015 19:30:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751024AbbJCTas (ORCPT ); Sat, 3 Oct 2015 15:30:48 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:35515 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750932AbbJCTaq (ORCPT ); Sat, 3 Oct 2015 15:30:46 -0400 Received: by wicge5 with SMTP id ge5so72165594wic.0 for ; Sat, 03 Oct 2015 12:30:45 -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=V2PRAlRPS8CwFVcuy2OlqYDCgFKmi3vgTm4sEFQ8lsQ=; b=eE9qEXdG+WgMOUeSqi4vZl6kVMBdwJEgAlKMbw7PQURU3SsTBepbVJaWiT+5WzAErY ePqu8XibdzPFgVkOwH/xrYXFBPjCBCzEwdSkTTQxAgyLDae35a2vMhfwS+pvLSO8tTJt 8o/5UOp8/kx4aN40LwRGohLTI49GdD2wpzk0PFb1kc4k6dwdgpRLb68d0qB1Z5fn+mWw QOAhdNbByXb3AoNoaN82KjoVcU9lfy9hmsLOlhnUwphU4GA3Zw2ziyqys2iYjSTJA/xs +xlhFvTXDOiqI2jrpR5LgQZmauAMm95DDBYQgsuln3MXNWc/df3zln70kfMWrEjDOYmR dxNA== X-Received: by 10.180.85.164 with SMTP id i4mr3913693wiz.54.1443900645492; Sat, 03 Oct 2015 12:30:45 -0700 (PDT) Received: from tipsey.3.home (188.30.130.225.threembb.co.uk. [188.30.130.225]) by smtp.gmail.com with ESMTPSA id uq5sm17886714wjc.3.2015.10.03.12.30.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Oct 2015 12:30:44 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 6/6] staging: vt6655: device_tx_srv rename pTD Date: Sat, 3 Oct 2015 20:30:27 +0100 Message-Id: <1443900627-2924-6-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1443900627-2924-1-git-send-email-tvboxspy@gmail.com> References: <1443900627-2924-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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Following the convention elsewhere for vnt_tx_desc rename desc. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/device_main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index ff329bd..673ca47 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -831,23 +831,23 @@ static int vnt_int_report_rate(struct vnt_private *priv, static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx) { - struct vnt_tx_desc *pTD; + struct vnt_tx_desc *desc; int works = 0; unsigned char byTsr0; unsigned char byTsr1; - for (pTD = priv->apTailTD[uIdx]; priv->iTDUsed[uIdx] > 0; pTD = pTD->next) { - if (pTD->td0.owner == OWNED_BY_NIC) + for (desc = priv->apTailTD[uIdx]; priv->iTDUsed[uIdx] > 0; desc = desc->next) { + if (desc->td0.owner == OWNED_BY_NIC) break; if (works++ > 15) break; - byTsr0 = pTD->td0.tsr0; - byTsr1 = pTD->td0.tsr1; + byTsr0 = desc->td0.tsr0; + byTsr1 = desc->td0.tsr1; /* Only the status of first TD in the chain is correct */ - if (pTD->td1.tcr & TCR_STP) { - if ((pTD->td_info->flags & TD_FLAGS_NETIF_SKB) != 0) { + if (desc->td1.tcr & TCR_STP) { + if ((desc->td_info->flags & TD_FLAGS_NETIF_SKB) != 0) { if (!(byTsr1 & TSR1_TERR)) { if (byTsr0 != 0) { pr_debug(" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X]\n", @@ -861,20 +861,20 @@ static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx) } if (byTsr1 & TSR1_TERR) { - if ((pTD->td_info->flags & TD_FLAGS_PRIV_SKB) != 0) { + if ((desc->td_info->flags & TD_FLAGS_PRIV_SKB) != 0) { pr_debug(" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X]\n", (int)uIdx, byTsr1, byTsr0); } } - vnt_int_report_rate(priv, pTD->td_info, byTsr0, byTsr1); + vnt_int_report_rate(priv, desc->td_info, byTsr0, byTsr1); - device_free_tx_buf(priv, pTD); + device_free_tx_buf(priv, desc); priv->iTDUsed[uIdx]--; } } - priv->apTailTD[uIdx] = pTD; + priv->apTailTD[uIdx] = desc; return works; }