From patchwork Sun Mar 6 12:57:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513371 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 0C2BFC0553 for ; Sun, 6 Mar 2016 12:57:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28EAB20172 for ; Sun, 6 Mar 2016 12:57:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D8E92017D for ; Sun, 6 Mar 2016 12:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751658AbcCFM5w (ORCPT ); Sun, 6 Mar 2016 07:57:52 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34845 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751591AbcCFM5i (ORCPT ); Sun, 6 Mar 2016 07:57:38 -0500 Received: by mail-wm0-f67.google.com with SMTP id 1so6277650wmg.2 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=VIRFkzhYADIvO4Si4OglbSvj9DdSjRNN5HwjK5MGsBQ=; b=AF3vLGfkPpVyIva/pt+LoRl5s/kiJ/RIMR+UvkgRbHOdnK+fVXXKZNdTiS6n1qDtfR DHAXtOPxea6dvuH7tIne19XFYGiMwPfBzXXi+PksWSB03tU6zt2Jn3l2/2gqNHfPQM2i pENLG+pk2Au5JpMiU6jHJd8HkR8c4MAyIwQNcp14oZe4Nd1Xdm8MxK6VXNjQlNWALi6L Rr7VJ/djmEPHaUdCUQstmdc36FrFMTuTJzPCQLZJUYdTMX7HDFFjd8he6UZP17sZgtJ0 gdZDITTMeAu/JcxWgt/egzE6RNK+JiVegYK0J8ruMV9Rczsfo3ZkPl1PPN4atvFVFXlI jxFQ== 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=VIRFkzhYADIvO4Si4OglbSvj9DdSjRNN5HwjK5MGsBQ=; b=Nxm8u10KRXqIzJfoqEjZ9IoGHNuSAMZTaO8Ok5a7M5aeyZcgh0I/FPEP+WNMxo6UOj VhOLTFWc3WTfl4jNfLAaBjV3sOumpy+4O+aZYxTb7GcrVpqrsJNz7yTzMUKeDwaFgpA9 7gIdXzArfO2YAGnM7q5X+cG6p/IahdikgJEXidHESvg25t/4dKQ1Odse2x2a9IE48los kWcmlb66WASDeaLNvIrUOR2mn+U9Wn7RXyk7YaKLYbVxIlnNcDnZ86/sMtTkScy5bmrC sGfdUrrAR8uPGHTeOpPC28QLZoYtqTtzvNyIP+g4GyBaQs6XFf8tmGauEIPOT3vM5zZT 4Ilg== X-Gm-Message-State: AD7BkJLG4EFMTHIIxVAkFxsGM/FXrA9uUS4Eow2LRsdQYySb3PHJaFrg/zIEmMGw2JhsgQ== X-Received: by 10.28.184.137 with SMTP id i131mr7434329wmf.96.1457269057080; Sun, 06 Mar 2016 04:57:37 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:36 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 13/13] staging: vt6655: mac.c replace dwData with data. Date: Sun, 6 Mar 2016 12:57:12 +0000 Message-Id: <1457269032-2681-13-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 | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index e762c33..45196c6 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -748,14 +748,14 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime } void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, - u32 dwData) + u32 data) { void __iomem *io_base = priv->PortOffset; if (offset > 273) return; iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); - iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); + iowrite32(data, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); } @@ -804,7 +804,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, { void __iomem *io_base = priv->PortOffset; unsigned short offset; - u32 dwData; + u32 data; int ii; if (byLocalID <= 1) @@ -814,30 +814,30 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, offset = MISCFIFO_KEYETRY0; offset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); - dwData = 0; - dwData |= wKeyCtl; - dwData <<= 16; - dwData |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5)); + data = 0; + data |= wKeyCtl; + data <<= 16; + data |= MAKEWORD(*(pbyAddr + 4), *(pbyAddr + 5)); pr_debug("1. offset: %d, Data: %X, KeyCtl:%X\n", - offset, dwData, wKeyCtl); + offset, data, wKeyCtl); iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); - iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); + iowrite32(data, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); offset++; - dwData = 0; - dwData |= *(pbyAddr+3); - dwData <<= 8; - dwData |= *(pbyAddr+2); - dwData <<= 8; - dwData |= *(pbyAddr+1); - dwData <<= 8; - dwData |= *(pbyAddr+0); - pr_debug("2. offset: %d, Data: %X\n", offset, dwData); + data = 0; + data |= *(pbyAddr + 3); + data <<= 8; + data |= *(pbyAddr + 2); + data <<= 8; + data |= *(pbyAddr + 1); + data <<= 8; + data |= *pbyAddr; + pr_debug("2. offset: %d, Data: %X\n", offset, data); iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); - iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); + iowrite32(data, io_base + MAC_REG_MISCFFDATA); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); offset++;