From patchwork Sun Mar 6 12:57:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513351 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 5AEA8C0553 for ; Sun, 6 Mar 2016 12:57:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67125201B4 for ; Sun, 6 Mar 2016 12:57:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E6CA201CD for ; Sun, 6 Mar 2016 12:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751641AbcCFM5s (ORCPT ); Sun, 6 Mar 2016 07:57:48 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34809 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751575AbcCFM5g (ORCPT ); Sun, 6 Mar 2016 07:57:36 -0500 Received: by mail-wm0-f67.google.com with SMTP id p65so6295183wmp.1 for ; Sun, 06 Mar 2016 04:57:35 -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=NHXSCNLQU/+JHyospJfxeIjxvvvA6KUr6w4e92GPn10=; b=m+I5QsBRBFX0mtF07MSOoTIV6XmUeoQDUqN5TMhjraZgaHix5tHLf0NNzpSiNNHyWa V6B6wtlUKtYIX9mjUeGgeGUUELAfRjKy42jYNM3oDEFJhJYRirlv0qCXdTtkdaM5Bxed idO/QdSmcEKtK2jjJSp+VhWtHjBSpuWS5PZkGGmB7FQwNHLCC83QGNQTomG5EYhtxIm7 5mA2A3gF6wZ+sgxfr75BkY+RRQaag+DGZcMGxOsiV6De1l3w6OXuAVglDlldvTvQ3jtr i5DegEHt/MCMdePz/oW0iSclBFeW5b9VOCMYYuRZgNho6FAPOFbA7nt42OA3m8PtO/Fw qINA== 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=NHXSCNLQU/+JHyospJfxeIjxvvvA6KUr6w4e92GPn10=; b=ibthjG+k6+JR4pVoaQZrHcIRdgZBdSg+0T/ih+9cOLNdblXOIKmjlvpW1O+DXd96gx TEEoyZ85j/SJKw3SuOsRso5d38Oobc3aPFMkGwtnNk5RWGcf257/tTAzn955rm5v+OzE xAKyrt27hb3693yf9Ne/K9qKUy6UVv6ziXLPzK42zIfShAcPtrrFrIIy+DvxzQufc5mB mEMBtFe1olsdrNvlWI2KnMegr6VG+kyIY3Ziwawd/7fcbHqlOJjLzpbRrgD8jeGPybMx PS6J3pZUksuLjKqkJZq9C0CRLI2lYFPmh2s9WOrRvEaXTqsqa5bSRqufGehMlJM+kAgN NIuw== X-Gm-Message-State: AD7BkJId90tzwnOODFL2lNss950El6EbokxO7GXo17Gvvnh7/NoiMA6t5iM4Z9Cg3S3adQ== X-Received: by 10.28.5.203 with SMTP id 194mr8317349wmf.101.1457269055137; Sun, 06 Mar 2016 04:57:35 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:34 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 11/13] staging: vt6655: mac.c replace byOrgDMACtl with org_dma_ctl Date: Sun, 6 Mar 2016 12:57:10 +0000 Message-Id: <1457269032-2681-11-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 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index d44026b..87bec1c 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -556,10 +556,10 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; - unsigned char byOrgDMACtl; + unsigned char org_dma_ctl; - byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL0); - if (byOrgDMACtl & DMACTL_RUN) + org_dma_ctl = ioread8(io_base + MAC_REG_RXDMACTL0); + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0 + 2); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { @@ -568,7 +568,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) } iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR0); - if (byOrgDMACtl & DMACTL_RUN) + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0); } @@ -590,10 +590,10 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; - unsigned char byOrgDMACtl; + unsigned char org_dma_ctl; - byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL1); - if (byOrgDMACtl & DMACTL_RUN) + org_dma_ctl = ioread8(io_base + MAC_REG_RXDMACTL1); + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1 + 2); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { @@ -602,7 +602,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) } iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR1); - if (byOrgDMACtl & DMACTL_RUN) + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1); } @@ -626,10 +626,10 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, { void __iomem *io_base = priv->PortOffset; unsigned short ww; - unsigned char byOrgDMACtl; + unsigned char org_dma_ctl; - byOrgDMACtl = ioread8(io_base + MAC_REG_TXDMACTL0); - if (byOrgDMACtl & DMACTL_RUN) + org_dma_ctl = ioread8(io_base + MAC_REG_TXDMACTL0); + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0 + 2); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { @@ -638,7 +638,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, } iowrite32(curr_desc_addr, io_base + MAC_REG_TXDMAPTR0); - if (byOrgDMACtl & DMACTL_RUN) + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0); } @@ -662,10 +662,10 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, { void __iomem *io_base = priv->PortOffset; unsigned short ww; - unsigned char byOrgDMACtl; + unsigned char org_dma_ctl; - byOrgDMACtl = ioread8(io_base + MAC_REG_AC0DMACTL); - if (byOrgDMACtl & DMACTL_RUN) + org_dma_ctl = ioread8(io_base + MAC_REG_AC0DMACTL); + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL + 2); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { @@ -675,7 +675,7 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, if (ww == W_MAX_TIMEOUT) pr_debug(" DBG_PORT80(0x26)\n"); iowrite32(curr_desc_addr, io_base + MAC_REG_AC0DMAPTR); - if (byOrgDMACtl & DMACTL_RUN) + if (org_dma_ctl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL); }