Commit 31760f04 authored by Danijel Korent's avatar Danijel Korent Committed by Greg Kroah-Hartman

staging: rtl8192e: Added spaces around operators in rtl_cam.c/rtl_eeprom.c

Fixed "spaces preferred around operator" type of problems reported by
checkpatch
Signed-off-by: default avatarDanijel Korent <danijel.korent@gmail.com>
Link: https://lore.kernel.org/r/20221015165023.487200-1-danijel.korent@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1445e7b
...@@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev) ...@@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev)
{ {
u32 ulcommand = 0; u32 ulcommand = 0;
ulcommand |= BIT31|BIT30; ulcommand |= BIT31 | BIT30;
rtl92e_writel(dev, RWCAM, ulcommand); rtl92e_writel(dev, RWCAM, ulcommand);
} }
...@@ -40,7 +40,6 @@ void rtl92e_enable_hw_security_config(struct net_device *dev) ...@@ -40,7 +40,6 @@ void rtl92e_enable_hw_security_config(struct net_device *dev)
SECR_value |= SCR_TxUseDK; SECR_value |= SCR_TxUseDK;
} }
ieee->hwsec_active = 1; ieee->hwsec_active = 1;
if ((ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE) || !hwwep) { if ((ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE) || !hwwep) {
ieee->hwsec_active = 0; ieee->hwsec_active = 0;
...@@ -98,33 +97,33 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex, ...@@ -98,33 +97,33 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
} }
if (DefaultKey) if (DefaultKey)
usConfig |= BIT15 | (KeyType<<2); usConfig |= BIT15 | (KeyType << 2);
else else
usConfig |= BIT15 | (KeyType<<2) | KeyIndex; usConfig |= BIT15 | (KeyType << 2) | KeyIndex;
for (i = 0; i < CAM_CONTENT_COUNT; i++) { for (i = 0; i < CAM_CONTENT_COUNT; i++) {
TargetCommand = i + CAM_CONTENT_COUNT * EntryNo; TargetCommand = i + CAM_CONTENT_COUNT * EntryNo;
TargetCommand |= BIT31|BIT16; TargetCommand |= BIT31 | BIT16;
if (i == 0) { if (i == 0) {
TargetContent = (u32)(*(MacAddr+0)) << 16 | TargetContent = (u32)(*(MacAddr + 0)) << 16 |
(u32)(*(MacAddr+1)) << 24 | (u32)(*(MacAddr + 1)) << 24 |
(u32)usConfig; (u32)usConfig;
rtl92e_writel(dev, WCAMI, TargetContent); rtl92e_writel(dev, WCAMI, TargetContent);
rtl92e_writel(dev, RWCAM, TargetCommand); rtl92e_writel(dev, RWCAM, TargetCommand);
} else if (i == 1) { } else if (i == 1) {
TargetContent = (u32)(*(MacAddr+2)) | TargetContent = (u32)(*(MacAddr + 2)) |
(u32)(*(MacAddr+3)) << 8 | (u32)(*(MacAddr + 3)) << 8 |
(u32)(*(MacAddr+4)) << 16 | (u32)(*(MacAddr + 4)) << 16 |
(u32)(*(MacAddr+5)) << 24; (u32)(*(MacAddr + 5)) << 24;
rtl92e_writel(dev, WCAMI, TargetContent); rtl92e_writel(dev, WCAMI, TargetContent);
rtl92e_writel(dev, RWCAM, TargetCommand); rtl92e_writel(dev, RWCAM, TargetCommand);
} else { } else {
if (KeyContent != NULL) { if (KeyContent != NULL) {
rtl92e_writel(dev, WCAMI, rtl92e_writel(dev, WCAMI,
(u32)(*(KeyContent+i-2))); (u32)(*(KeyContent + i - 2)));
rtl92e_writel(dev, RWCAM, TargetCommand); rtl92e_writel(dev, RWCAM, TargetCommand);
udelay(100); udelay(100);
} }
......
...@@ -79,6 +79,6 @@ u32 rtl92e_eeprom_read(struct net_device *dev, u32 addr) ...@@ -79,6 +79,6 @@ u32 rtl92e_eeprom_read(struct net_device *dev, u32 addr)
ret = _rtl92e_eeprom_xfer(dev, (addr & 0x3F) | (0x6 << 6), 9); ret = _rtl92e_eeprom_xfer(dev, (addr & 0x3F) | (0x6 << 6), 9);
rtl92e_writeb(dev, EPROM_CMD, rtl92e_writeb(dev, EPROM_CMD,
(EPROM_CMD_NORMAL<<EPROM_CMD_OPERATING_MODE_SHIFT)); (EPROM_CMD_NORMAL << EPROM_CMD_OPERATING_MODE_SHIFT));
return ret; return ret;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment