From: Malcolm Priestley <tvboxspy@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, Malcolm Priestley <tvboxspy@gmail.com>
Subject: [PATCH 12/13] staging: vt6655: mac.c replace wOffset with offset.
Date: Sun, 6 Mar 2016 12:57:11 +0000 [thread overview]
Message-ID: <1457269032-2681-12-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 | 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);
}
--
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 ` [PATCH 11/13] staging: vt6655: mac.c replace byOrgDMACtl with org_dma_ctl Malcolm Priestley
2016-03-06 12:57 ` Malcolm Priestley [this message]
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-12-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).