From patchwork Sun Mar 6 12:57:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513361 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 24732C0553 for ; Sun, 6 Mar 2016 12:57:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3214F2017E for ; Sun, 6 Mar 2016 12:57:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B0C52017D for ; Sun, 6 Mar 2016 12:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751650AbcCFM5u (ORCPT ); Sun, 6 Mar 2016 07:57:50 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33797 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbcCFM5h (ORCPT ); Sun, 6 Mar 2016 07:57:37 -0500 Received: by mail-wm0-f65.google.com with SMTP id p65so6295280wmp.1 for ; Sun, 06 Mar 2016 04:57:37 -0800 (PST) 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=BMjVmYLbgTEj4iL9ksaQExcvE5oo9FE+n4b8jHiPbnM=; b=mr/juQ8EVWxZCqk7D5XkHXObjTqPr2qnq6/PdwADxx8rBSDAR5vAQ3S2iy7zJvzaxT kXV0L813gLPtPEGfaPaawdqXjNUe7HR4M8GUHv/LKbIdUvZJShhSqkodLvBeGSJS5f2j /lWiiFMJ7IJ7kLlfQmblG9HjtLeXfN4jkBM3+SNbqVzUtCvFuKnO3l/O3CqCllVRVNXP VQrYNQRSA7pWz5iDcfcF2lgNFaZpP2+x46ApUrzoYsS9X19u8HaqxUGQ+sSQ7i2RhYdG Lm2YG9oSVqMUdHGAge0rKxalwVkqqlOPOoHoeeeKms9lMoMb4/Svd4rHks3CLrP5hHxp AGJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BMjVmYLbgTEj4iL9ksaQExcvE5oo9FE+n4b8jHiPbnM=; b=Nl+YoGaNkiH0SlhElK6xpefnrQpJupoWbDhK8T7q481Z/kR3kT9hJ95H+x273Qu7Fw 4Kw2iQnYQoTi8VNeUudh62IoAjaWYYbNBVHjQfIppoKOUqceznW1PvR/84atvexNLfgx Akb2LMw9Y+GthPT8EgEBrHstRBvbKXCIidrJU7jc7Gx8kQjN+tYl7vhYRl7GkJykWOFb 12bWiw69iFpWyhOprzd4hI+6DM5PIIavbNUctE9qoZgqRQCvuhrSaH0kIzWi89TTwukD 8fVnIWV/Gg5xFjEYiukm1EEYp0Q6eudzdsCtZqlcYrD+3GNM2OXwNoIoeD/DW0JbAZJx PAvQ== X-Gm-Message-State: AD7BkJJ2HRC/XBdBUtTsDYpiIfVMsewsrnTrc7QVjJ6Mom9rC5ot0/WgeBuASM1uBrxKUQ== X-Received: by 10.28.88.15 with SMTP id m15mr7550610wmb.60.1457269056160; Sun, 06 Mar 2016 04:57:36 -0800 (PST) Received: from tipsey.3.home (188.30.137.64.threembb.co.uk. [188.30.137.64]) by smtp.gmail.com with ESMTPSA id n10sm12839950wjf.28.2016.03.06.04.57.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:35 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 12/13] staging: vt6655: mac.c replace wOffset with offset. Date: Sun, 6 Mar 2016 12:57:11 +0000 Message-Id: <1457269032-2681-12-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457269032-2681-1-git-send-email-tvboxspy@gmail.com> References: <1457269032-2681-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, 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 Removing camel case and type prefix. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/mac.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 87bec1c..e762c33 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -747,14 +747,14 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime iowrite8((TMCTL_TMD | TMCTL_TE), io_base + MAC_REG_TMCTL1); } -void MACvSetMISCFifo(struct vnt_private *priv, unsigned short wOffset, +void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, u32 dwData) { void __iomem *io_base = priv->PortOffset; - if (wOffset > 273) + if (offset > 273) return; - iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); + iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); } @@ -803,7 +803,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, unsigned char byLocalID) { void __iomem *io_base = priv->PortOffset; - unsigned short wOffset; + unsigned short offset; u32 dwData; int ii; @@ -811,20 +811,20 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, return; pr_debug("MACvSetKeyEntry\n"); - wOffset = MISCFIFO_KEYETRY0; - wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); + offset = MISCFIFO_KEYETRY0; + offset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); dwData = 0; dwData |= wKeyCtl; dwData <<= 16; dwData |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5)); - pr_debug("1. wOffset: %d, Data: %X, KeyCtl:%X\n", - wOffset, dwData, wKeyCtl); + pr_debug("1. offset: %d, Data: %X, KeyCtl:%X\n", + offset, dwData, wKeyCtl); - iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); + iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); - wOffset++; + offset++; dwData = 0; dwData |= *(pbyAddr+3); @@ -834,19 +834,19 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, dwData |= *(pbyAddr+1); dwData <<= 8; dwData |= *(pbyAddr+0); - pr_debug("2. wOffset: %d, Data: %X\n", wOffset, dwData); + pr_debug("2. offset: %d, Data: %X\n", offset, dwData); - iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); + iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); - wOffset++; + offset++; - wOffset += (uKeyIdx * 4); + offset += (uKeyIdx * 4); for (ii = 0; ii < 4; ii++) { /* always push 128 bits */ - pr_debug("3.(%d) wOffset: %d, Data: %X\n", - ii, wOffset+ii, *pdwKey); - iowrite16(wOffset + ii, io_base + MAC_REG_MISCFFNDEX); + pr_debug("3.(%d) offset: %d, Data: %X\n", + ii, offset + ii, *pdwKey); + iowrite16(offset + ii, io_base + MAC_REG_MISCFFNDEX); iowrite32(*pdwKey++, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); } @@ -869,12 +869,12 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx) { void __iomem *io_base = priv->PortOffset; - unsigned short wOffset; + unsigned short offset; - wOffset = MISCFIFO_KEYETRY0; - wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); + offset = MISCFIFO_KEYETRY0; + offset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); - iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); + iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite32(0, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); }