From patchwork Sun Mar 6 12:57:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513341 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 CB1A4C0553 for ; Sun, 6 Mar 2016 12:57:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C53B5201CE for ; Sun, 6 Mar 2016 12:57:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A95442017E for ; Sun, 6 Mar 2016 12:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751632AbcCFM5q (ORCPT ); Sun, 6 Mar 2016 07:57:46 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34803 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751563AbcCFM5f (ORCPT ); Sun, 6 Mar 2016 07:57:35 -0500 Received: by mail-wm0-f65.google.com with SMTP id p65so6295163wmp.1 for ; Sun, 06 Mar 2016 04:57:34 -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=WbVOpIGocXuPaKFUU98BsFd6XjOhs6CjAWZ6KM3P+cA=; b=TvFJ/a/VfOd3W2HRiAlKrxOCv3FYjkwFaaVzOZn34V8krtIgOHuZ2jbQMhfrpVI090 Buw1itObnHXVumrYqIYLWLnkcrR9/bNbbEtfo1x3awf2ShmZQHd8iBvxjjumjXDr61IH H/mFgQmvIj2xFv+lKMRWFWeEJKQGvnKDAPku3lDWGr3omR3k1ayCX755biGIulk2z/cr NBiiNWJhLfVj/kvN1NBu59I37uEx5l87E2PcAcFxdfij+1vWqx+FqubUJdXGohDqXoFK XPJR6QPvoBcWvXrsIy3VlnOHz8OW9bKDRCdTQAE1ReBsETCnsdWD6ev2Z8LDp6kE0Ykl qOPw== 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=WbVOpIGocXuPaKFUU98BsFd6XjOhs6CjAWZ6KM3P+cA=; b=fhIz7wcZMHHDAx99OTgPWSyd/XNKHwHjD+ptr2DVPUQsfGJFd0AU1KuCDScnsx42of oCEEKwr6VsZYN6gsmd/HGlLf9+0CcPbrt0t7RrlwsC8R0aw6vI52ia8HOPKJ2+HWLGbR TYZZ2m14mbzrUvPbxIA6jGpOUIfzClSFtsbDZwB7b3x04oNNp+1WI5f02cTzAKTPxOlJ 4ca4P/MxnmqK4jindShcNMgLDEXOKf1QhYspa736x7K2G2Cm3PYfrNFnaoEjntk2+EQe jVHdieQueULn55E580tLkbyRPKp1wLVGFvVUTeiwcZ5JBaEcdD+zzPUBYJkDuWeK/nws IpEA== X-Gm-Message-State: AD7BkJL/fkqdmaxO5hKNrYZvYtA9QOgbZmPwnv3rcdE+/9jIbgCQO9iYExYoVUA2cCfLGQ== X-Received: by 10.28.53.134 with SMTP id c128mr7927786wma.10.1457269054233; Sun, 06 Mar 2016 04:57:34 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:33 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 10/13] staging: vt6655: mac Replace dwCurrDescAddr with curr_desc_addr. Date: Sun, 6 Mar 2016 12:57:09 +0000 Message-Id: <1457269032-2681-10-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 | 30 +++++++++++++++--------------- drivers/staging/vt6655/mac.h | 14 +++++++------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index a1be62d..d44026b 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -545,14 +545,14 @@ void MACvInitialize(struct vnt_private *priv) * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * * Return Value: none * */ -void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) +void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -567,7 +567,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) break; } - iowrite32(dwCurrDescAddr, io_base + MAC_REG_RXDMAPTR0); + iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR0); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0); } @@ -579,14 +579,14 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * * Return Value: none * */ -void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) +void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -601,7 +601,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) break; } - iowrite32(dwCurrDescAddr, io_base + MAC_REG_RXDMAPTR1); + iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR1); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1); @@ -614,7 +614,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * @@ -622,7 +622,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) * */ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, - u32 dwCurrDescAddr) + u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -637,7 +637,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, break; } - iowrite32(dwCurrDescAddr, io_base + MAC_REG_TXDMAPTR0); + iowrite32(curr_desc_addr, io_base + MAC_REG_TXDMAPTR0); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0); } @@ -649,7 +649,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * @@ -658,7 +658,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, */ /* TxDMA1 = AC0DMA */ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, - u32 dwCurrDescAddr) + u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -674,18 +674,18 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, } if (ww == W_MAX_TIMEOUT) pr_debug(" DBG_PORT80(0x26)\n"); - iowrite32(dwCurrDescAddr, io_base + MAC_REG_AC0DMAPTR); + iowrite32(curr_desc_addr, io_base + MAC_REG_AC0DMAPTR); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL); } void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - u32 dwCurrDescAddr) + u32 curr_desc_addr) { if (iTxType == TYPE_AC0DMA) - MACvSetCurrAC0DescAddrEx(priv, dwCurrDescAddr); + MACvSetCurrAC0DescAddrEx(priv, curr_desc_addr); else if (iTxType == TYPE_TXDMA0) - MACvSetCurrTx0DescAddrEx(priv, dwCurrDescAddr); + MACvSetCurrTx0DescAddrEx(priv, curr_desc_addr); } /* diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3eef928..030f529 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -916,19 +916,19 @@ bool MACbSafeStop(struct vnt_private *); bool MACbShutdown(struct vnt_private *); void MACvInitialize(struct vnt_private *); void MACvSetCurrRx0DescAddr(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrRx1DescAddr(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrTx0DescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrAC0DescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrSyncDescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrATIMDescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvTimer0MicroSDelay(struct vnt_private *, unsigned int uDelay); void MACvOneShotTimer1MicroSec(struct vnt_private *, unsigned int uDelayTime);