From: Malcolm Priestley <tvboxspy@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, Malcolm Priestley <tvboxspy@gmail.com>
Subject: [PATCH 11/13] staging: vt6655: mac.c replace byOrgDMACtl with org_dma_ctl
Date: Sun, 6 Mar 2016 12:57:10 +0000 [thread overview]
Message-ID: <1457269032-2681-11-git-send-email-tvboxspy@gmail.com> (raw)
In-Reply-To: <1457269032-2681-1-git-send-email-tvboxspy@gmail.com>
Removing camel case and type prefix.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
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);
}
--
2.7.0
next prev parent reply other threads:[~2016-03-06 12:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-06 12:57 [PATCH 01/13] staging: vt6655: mac.c rename pbyCxtBuf to cxt_buf Malcolm Priestley
2016-03-06 12:57 ` [PATCH 02/13] staging: vt6655: MACvRestoreContext replace for loops with memcpy_toio Malcolm Priestley
2016-03-06 12:57 ` [PATCH 03/13] staging: vt6655: mac.c/h resize all unsigned long to u32 Malcolm Priestley
2016-03-06 12:57 ` [PATCH 04/13] staging: vt6655: mac.c replace VNSvOutPortD with iowrite32 Malcolm Priestley
2016-03-06 12:57 ` [PATCH 05/13] staging: vt6655: mac.c replace VNSvOutPortW with iowrite16 Malcolm Priestley
2016-03-06 12:57 ` [PATCH 06/13] staging: vt6655: mac.c replace VNSvOutPortB with iowrite8 Malcolm Priestley
2016-03-06 12:57 ` [PATCH 07/13] staging: vt6655: MACbPSWakeup replace VNSvInPortB byOrgValue with ioread8 Malcolm Priestley
2016-03-06 12:57 ` [PATCH 08/13] staging: vt6655: MACvSetLoopbackMode replace " Malcolm Priestley
2016-03-06 12:57 ` [PATCH 09/13] staging: vt6655: mac.c replace VNSvInPortB " Malcolm Priestley
2016-03-06 12:57 ` [PATCH 10/13] staging: vt6655: mac Replace dwCurrDescAddr with curr_desc_addr Malcolm Priestley
2016-03-06 12:57 ` Malcolm Priestley [this message]
2016-03-06 12:57 ` [PATCH 12/13] staging: vt6655: mac.c replace wOffset with offset Malcolm Priestley
2016-03-06 12:57 ` [PATCH 13/13] staging: vt6655: mac.c replace dwData with data Malcolm Priestley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457269032-2681-11-git-send-email-tvboxspy@gmail.com \
--to=tvboxspy@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).