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