The variables of function setKey triggered a 'Avoid CamelCase'
warning from checkpatch.pl. This patch renames these
variables to correct this warning.
Signed-off-by: Camylla Goncalves Cantanheide <c.cantanhe...@gmail.com>
---
drivers/staging/rtl8192u/r8192U_core.c | 52 +++++++++++++-------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c
b/drivers/staging/rtl8192u/r8192U_core.c
index 93a15d57e..3aa87296d 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -4877,50 +4877,50 @@ void EnableHWSecurityConfig8192(struct net_device *dev)
write_nic_byte(dev, SECR, SECR_value);
}
-void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
- u8 *MacAddr, u8 DefaultKey, u32 *KeyContent)
+void setKey(struct net_device *dev, u8 entry_no, u8 key_idx, u16 key_type,
+ u8 *mac_addr, u8 default_key, u32 *key_content)
{
- u32 TargetCommand = 0;
- u32 TargetContent = 0;
- u16 usConfig = 0;
+ u32 target_cmd = 0;
+ u32 content = 0;
+ u16 config = 0;
u8 i;
- if (EntryNo >= TOTAL_CAM_ENTRY)
+ if (entry_no >= TOTAL_CAM_ENTRY)
RT_TRACE(COMP_ERR, "cam entry exceeds in %s\n", __func__);
RT_TRACE(COMP_SEC,
"====>to %s, dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d,
MacAddr%pM\n",
- __func__, dev, EntryNo, KeyIndex, KeyType, MacAddr);
+ __func__, dev, entry_no, key_idx, key_type, mac_addr);
- if (DefaultKey)
- usConfig |= BIT(15) | (KeyType << 2);
+ if (default_key)
+ config |= BIT(15) | (key_type << 2);
else
- usConfig |= BIT(15) | (KeyType << 2) | KeyIndex;
+ config |= BIT(15) | (key_type << 2) | key_idx;
for (i = 0; i < CAM_CONTENT_COUNT; i++) {
- TargetCommand = i + CAM_CONTENT_COUNT * EntryNo;
- TargetCommand |= BIT(31) | BIT(16);
+ target_cmd = i + CAM_CONTENT_COUNT * entry_no;
+ target_cmd |= BIT(31) | BIT(16);
if (i == 0) { /* MAC|Config */
- TargetContent = (u32)(*(MacAddr + 0)) << 16 |
- (u32)(*(MacAddr + 1)) << 24 |
- (u32)usConfig;
+ content = (u32)(*(mac_addr + 0)) << 16 |
+ (u32)(*(mac_addr + 1)) << 24 |
+ (u32)config;
- write_nic_dword(dev, WCAMI, TargetContent);
- write_nic_dword(dev, RWCAM, TargetCommand);
+ write_nic_dword(dev, WCAMI, content);
+ write_nic_dword(dev, RWCAM, target_cmd);
} else if (i == 1) { /* MAC */
- TargetContent = (u32)(*(MacAddr + 2)) |
- (u32)(*(MacAddr + 3)) << 8 |
- (u32)(*(MacAddr + 4)) << 16 |
- (u32)(*(MacAddr + 5)) << 24;
- write_nic_dword(dev, WCAMI, TargetContent);
- write_nic_dword(dev, RWCAM, TargetCommand);
+ content = (u32)(*(mac_addr + 2)) |
+ (u32)(*(mac_addr + 3)) << 8 |
+ (u32)(*(mac_addr + 4)) << 16 |
+ (u32)(*(mac_addr + 5)) << 24;
+ write_nic_dword(dev, WCAMI, content);
+ write_nic_dword(dev, RWCAM, target_cmd);
} else {
/* Key Material */
- if (KeyContent) {
+ if (key_content) {
write_nic_dword(dev, WCAMI,
- *(KeyContent + i - 2));
- write_nic_dword(dev, RWCAM, TargetCommand);
+ *(key_content + i - 2));
+ write_nic_dword(dev, RWCAM, target_cmd);
}
}
}
--
2.20.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
