From patchwork Sat Oct 17 10:32:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 7421941 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 89659BEEA4 for ; Sat, 17 Oct 2015 10:33:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9643F20615 for ; Sat, 17 Oct 2015 10:33:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DE0520614 for ; Sat, 17 Oct 2015 10:33:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751643AbbJQKdV (ORCPT ); Sat, 17 Oct 2015 06:33:21 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:34915 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbbJQKdU (ORCPT ); Sat, 17 Oct 2015 06:33:20 -0400 Received: by wicll6 with SMTP id ll6so38837723wic.0 for ; Sat, 17 Oct 2015 03:33:18 -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; bh=X5fptVWNujUDB4LCUj9tT5PFGsi4+00Uh5JFef6juX4=; b=PybyTrMKipSQPCMyFA3I+vTzkoQUU5pFE3XnaJQ+UbaUvI5ytE1RccO7UMeXOvQe/b 5pzPk0a3sxBjh+D0A0Q+QUBZUThgOb0fOGUWhS3tAfpHm7d/81Gn2bjEjTGkmM0Ic3ha inTXhksf17URuhxoFHVykUx2UiQ6cZ3pjEn7Ib6uN3Z4H/E6bzBHF9hYPc2qEaM/gyYT 1sSfoSBI0Uk9QKc2palvCPYn2T2HVZQdJEyGVXVYUqUG/aHJtUpxqci5mA3Y54jpTOm6 QRJAXwyEJG+PR9O2/2ir4up9rW8oLsGNBLxihDQbsG3bQ7PK8kSCYNDPdjpwT7jzmlJL oCAg== X-Received: by 10.180.23.165 with SMTP id n5mr9822228wif.26.1445077998466; Sat, 17 Oct 2015 03:33:18 -0700 (PDT) Received: from tipsey.3.home (188.30.104.3.threembb.co.uk. [188.30.104.3]) by smtp.gmail.com with ESMTPSA id fz2sm6645803wic.2.2015.10.17.03.33.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 Oct 2015 03:33:17 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 1/9] staging: vt6655: device_main Replace uIdx with idx. Date: Sat, 17 Oct 2015 11:32:54 +0100 Message-Id: <1445077982-17832-1-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.5.0 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 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 673ca47..0ed82a64 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -142,8 +142,8 @@ static void device_init_rd1_ring(struct vnt_private *priv); static void device_init_td0_ring(struct vnt_private *priv); static void device_init_td1_ring(struct vnt_private *priv); -static int device_rx_srv(struct vnt_private *priv, unsigned int uIdx); -static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx); +static int device_rx_srv(struct vnt_private *priv, unsigned int idx); +static int device_tx_srv(struct vnt_private *priv, unsigned int idx); static bool device_alloc_rx_buf(struct vnt_private *, struct vnt_rx_desc *); static void device_init_registers(struct vnt_private *priv); static void device_free_tx_buf(struct vnt_private *, struct vnt_tx_desc *); @@ -700,12 +700,12 @@ static void device_free_td1_ring(struct vnt_private *priv) /*-----------------------------------------------------------------*/ -static int device_rx_srv(struct vnt_private *priv, unsigned int uIdx) +static int device_rx_srv(struct vnt_private *priv, unsigned int idx) { struct vnt_rx_desc *rd; int works = 0; - for (rd = priv->pCurrRD[uIdx]; + for (rd = priv->pCurrRD[idx]; rd->rd0.owner == OWNED_BY_HOST; rd = rd->next) { if (works++ > 15) @@ -724,7 +724,7 @@ static int device_rx_srv(struct vnt_private *priv, unsigned int uIdx) rd->rd0.owner = OWNED_BY_NIC; } - priv->pCurrRD[uIdx] = rd; + priv->pCurrRD[idx] = rd; return works; } @@ -829,14 +829,14 @@ static int vnt_int_report_rate(struct vnt_private *priv, return 0; } -static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx) +static int device_tx_srv(struct vnt_private *priv, unsigned int idx) { struct vnt_tx_desc *desc; int works = 0; unsigned char byTsr0; unsigned char byTsr1; - for (desc = priv->apTailTD[uIdx]; priv->iTDUsed[uIdx] > 0; desc = desc->next) { + for (desc = priv->apTailTD[idx]; priv->iTDUsed[idx] > 0; desc = desc->next) { if (desc->td0.owner == OWNED_BY_NIC) break; if (works++ > 15) @@ -851,30 +851,30 @@ static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx) if (!(byTsr1 & TSR1_TERR)) { if (byTsr0 != 0) { pr_debug(" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X]\n", - (int)uIdx, byTsr1, + (int)idx, byTsr1, byTsr0); } } else { pr_debug(" Tx[%d] dropped & tsr1[%02X] tsr0[%02X]\n", - (int)uIdx, byTsr1, byTsr0); + (int)idx, byTsr1, byTsr0); } } if (byTsr1 & TSR1_TERR) { 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); + (int)idx, byTsr1, byTsr0); } } vnt_int_report_rate(priv, desc->td_info, byTsr0, byTsr1); device_free_tx_buf(priv, desc); - priv->iTDUsed[uIdx]--; + priv->iTDUsed[idx]--; } } - priv->apTailTD[uIdx] = desc; + priv->apTailTD[idx] = desc; return works; }