From patchwork Sat Oct 3 19:30:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 7322311 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 6C026BEEA4 for ; Sat, 3 Oct 2015 19:30:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D7CA20452 for ; Sat, 3 Oct 2015 19:30:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95E2920584 for ; Sat, 3 Oct 2015 19:30:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750973AbbJCTap (ORCPT ); Sat, 3 Oct 2015 15:30:45 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33827 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750932AbbJCTao (ORCPT ); Sat, 3 Oct 2015 15:30:44 -0400 Received: by wicfx3 with SMTP id fx3so71872339wic.1 for ; Sat, 03 Oct 2015 12:30: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=wT7NfaoyUyH9BeP/D8O4gGMyOzx5hBmHJIOjfce+dNY=; b=IVY4TkqMZ+x1OG59C9mT7DrSogwsAFzevEGnMS5lI6Ju1aIM3DuD+OJ5t21PG6VQ18 4r9L6rTz9yibbLr7f5rRDj6R0OLAXTZZvCi5GLbIQVxp3S3QClYSC8E3Qa4AqWw0sKAN jgYSDdg58F/H7T+uNJLkp10Q5UugxFfV2ZLJ//Rc+GbZ8mC9S9knX+yj5XmXiBxcO0wp wyLtTyFcR41B4OaB+ZH7VkcoA3NL9p3LaBv3kpWoEGjGTLlCaMqODAr3QZh8QD1gRnaX k8q+dupayGkbxierDlzTtIebkDU+uK+eEqbdl7MZGQZ53D+4M5f1VxNa/lch7YSNbszA fVLw== X-Received: by 10.180.221.193 with SMTP id qg1mr3492685wic.87.1443900643500; Sat, 03 Oct 2015 12:30:43 -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.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Oct 2015 12:30:43 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 4/6] staging: vt6655: device_main replace pRD with rd. Date: Sat, 3 Oct 2015 20:30:25 +0100 Message-Id: <1443900627-2924-4-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 Removing camel case. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/device_main.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index b330379..7e76176 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -702,37 +702,37 @@ static void device_free_td1_ring(struct vnt_private *priv) static int device_rx_srv(struct vnt_private *priv, unsigned int uIdx) { - struct vnt_rx_desc *pRD; + struct vnt_rx_desc *rd; int works = 0; - for (pRD = priv->pCurrRD[uIdx]; - pRD->rd0.owner == OWNED_BY_HOST; - pRD = pRD->next) { + for (rd = priv->pCurrRD[uIdx]; + rd->rd0.owner == OWNED_BY_HOST; + rd = rd->next) { if (works++ > 15) break; - if (!pRD->rd_info->skb) + if (!rd->rd_info->skb) break; - if (vnt_receive_frame(priv, pRD)) { - if (!device_alloc_rx_buf(priv, pRD)) { + if (vnt_receive_frame(priv, rd)) { + if (!device_alloc_rx_buf(priv, rd)) { dev_err(&priv->pcid->dev, "can not allocate rx buf\n"); break; } } - pRD->rd0.owner = OWNED_BY_NIC; + rd->rd0.owner = OWNED_BY_NIC; } - priv->pCurrRD[uIdx] = pRD; + priv->pCurrRD[uIdx] = rd; return works; } static bool device_alloc_rx_buf(struct vnt_private *priv, - struct vnt_rx_desc *pRD) + struct vnt_rx_desc *rd) { - struct vnt_rd_info *rd_info = pRD->rd_info; + struct vnt_rd_info *rd_info = rd->rd_info; rd_info->skb = dev_alloc_skb((int)priv->rx_buf_sz); if (rd_info->skb == NULL) @@ -743,12 +743,12 @@ static bool device_alloc_rx_buf(struct vnt_private *priv, skb_put(rd_info->skb, skb_tailroom(rd_info->skb)), priv->rx_buf_sz, DMA_FROM_DEVICE); - *((unsigned int *)&pRD->rd0) = 0; /* FIX cast */ + *((unsigned int *)&rd->rd0) = 0; /* FIX cast */ - pRD->rd0.res_count = cpu_to_le16(priv->rx_buf_sz); - pRD->rd0.owner = OWNED_BY_NIC; - pRD->rd1.req_count = cpu_to_le16(priv->rx_buf_sz); - pRD->buff_addr = cpu_to_le32(rd_info->skb_dma); + rd->rd0.res_count = cpu_to_le16(priv->rx_buf_sz); + rd->rd0.owner = OWNED_BY_NIC; + rd->rd1.req_count = cpu_to_le16(priv->rx_buf_sz); + rd->buff_addr = cpu_to_le32(rd_info->skb_dma); return true; }