2013-06-05 20:33:11

by Malcolm Priestley

[permalink] [raw]
Subject: [PATCH 06/13] staging: vt6656: clean up MACvRegBitsOn

Remove internal white space and camel case.

Camel case changes;
pDevice -> priv
byRegOfs -> offset
byBits -> bits
pbyData -> data

Functional change
CONTROLnsRequestOut Length = ARRAY_SIZE(data)
offset changed to u16

Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/mac.c | 17 ++++++-----------
drivers/staging/vt6656/mac.h | 2 +-
2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 77ec057..d690ef1 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -201,20 +201,15 @@ void MACvRegBitsOff(struct vnt_private *priv, u16 offset, u8 bits)
offset, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
}

-void MACvRegBitsOn(struct vnt_private *pDevice, u8 byRegOfs, u8 byBits)
+void MACvRegBitsOn(struct vnt_private *priv, u16 offset, u8 bits)
{
- u8 pbyData[2];
+ u8 data[2];

- pbyData[0] = byBits;
- pbyData[1] = byBits;
+ data[0] = bits;
+ data[1] = bits;

- CONTROLnsRequestOut(pDevice,
- MESSAGE_TYPE_WRITE_MASK,
- byRegOfs,
- MESSAGE_REQUEST_MACREG,
- 2,
- pbyData
- );
+ CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE_MASK,
+ offset, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
}

void MACvWriteWord(struct vnt_private *pDevice, u8 byRegOfs, u16 wData)
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index 4aa0f8d..91964e8 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -409,7 +409,7 @@ void MACvSetBBType(struct vnt_private *, u8);
void MACvDisableKeyEntry(struct vnt_private *, u32);
void MACvSetKeyEntry(struct vnt_private *, u16, u32, u16, u8 *, u32 *);
void MACvRegBitsOff(struct vnt_private *, u16, u8);
-void MACvRegBitsOn(struct vnt_private *, u8, u8);
+void MACvRegBitsOn(struct vnt_private *, u16, u8);
void MACvWriteWord(struct vnt_private *, u8, u16);
void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);
void MACvEnableProtectMD(struct vnt_private *);
--
1.8.1.2