Re: [PATCH 07/20] staging: rtl8192u: r8192_core: whitespace neatening
On Sat, Aug 15, 2015 at 09:34:03PM -0400, Raphaël Beamonte wrote: > Signed-off-by: Raphaël Beamonte > --- > @@ -2182,30 +2182,30 @@ static void rtl8192_init_priv_variable(struct > net_device *dev) > priv->EarlyRxThreshold = 7; > priv->enable_gpio0 = 0; > priv->TransmitConfig = > - (TCR_MXDMA_2048< Tx DMA Burst, 7: reserved. > - (priv->ShortRetryLimit< limit > - (priv->LongRetryLimit< limit > + (TCR_MXDMA_2048 << TCR_MXDMA_OFFSET) | // Max DMA Burst Size > per Tx DMA Burst, 7: reserved. > + (priv->ShortRetryLimit << TCR_SRL_OFFSET) | // Short > retry limit > + (priv->LongRetryLimit << TCR_LRL_OFFSET) |// Long retry > limit > (false ? TCR_SAT : 0); // FALSE: HW provides PLCP length and > LENGEXT, TRUE: SW provides them > #ifdef TO_DO_LIST > if (Adapter->bInHctTest) > pHalData->ReceiveConfig = pHalData->CSMethod | > - RCR_AMF | RCR_ADF | > //accept management/data > + RCR_AMF | RCR_ADF | > //accept management/data > //guangan200710 > - RCR_ACF | //accept > control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. > - RCR_AB | RCR_AM | RCR_APM | > //accept BC/MC/UC > - RCR_AICV | RCR_ACRC32 | > //accept ICV/CRC error packet > - ((u32)7< Max DMA Burst Size per Rx DMA Burst, 7: unlimited. > - > (pHalData->EarlyRxThreshold< Rx threshold. > + RCR_ACF | //accept > control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. > + RCR_AB | RCR_AM | RCR_APM | > //accept BC/MC/UC > + RCR_AICV | RCR_ACRC32 | > //accept ICV/CRC error packet > + ((u32)7 << RCR_MXDMA_OFFSET) | > // Max DMA Burst Size per Tx DMA Burst, 7: reserved. looks like the comment has changed. copy paste error from previous lines? regards sudip -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 07/20] staging: rtl8192u: r8192_core: whitespace neatening
On Sat, Aug 15, 2015 at 09:34:03PM -0400, Raphaël Beamonte wrote: Signed-off-by: Raphaël Beamonte raphael.beamo...@gmail.com --- snip @@ -2182,30 +2182,30 @@ static void rtl8192_init_priv_variable(struct net_device *dev) priv-EarlyRxThreshold = 7; priv-enable_gpio0 = 0; priv-TransmitConfig = - (TCR_MXDMA_2048TCR_MXDMA_OFFSET) | // Max DMA Burst Size per Tx DMA Burst, 7: reserved. - (priv-ShortRetryLimitTCR_SRL_OFFSET) | // Short retry limit - (priv-LongRetryLimitTCR_LRL_OFFSET) |// Long retry limit + (TCR_MXDMA_2048 TCR_MXDMA_OFFSET) | // Max DMA Burst Size per Tx DMA Burst, 7: reserved. + (priv-ShortRetryLimit TCR_SRL_OFFSET) | // Short retry limit + (priv-LongRetryLimit TCR_LRL_OFFSET) |// Long retry limit (false ? TCR_SAT : 0); // FALSE: HW provides PLCP length and LENGEXT, TRUE: SW provides them #ifdef TO_DO_LIST if (Adapter-bInHctTest) pHalData-ReceiveConfig = pHalData-CSMethod | - RCR_AMF | RCR_ADF | //accept management/data + RCR_AMF | RCR_ADF | //accept management/data //guangan200710 - RCR_ACF | //accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. - RCR_AB | RCR_AM | RCR_APM | //accept BC/MC/UC - RCR_AICV | RCR_ACRC32 | //accept ICV/CRC error packet - ((u32)7RCR_MXDMA_OFFSET) | // Max DMA Burst Size per Rx DMA Burst, 7: unlimited. - (pHalData-EarlyRxThresholdRCR_FIFO_OFFSET) | // Rx FIFO Threshold, 7: No Rx threshold. + RCR_ACF | //accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. + RCR_AB | RCR_AM | RCR_APM | //accept BC/MC/UC + RCR_AICV | RCR_ACRC32 | //accept ICV/CRC error packet + ((u32)7 RCR_MXDMA_OFFSET) | // Max DMA Burst Size per Tx DMA Burst, 7: reserved. looks like the comment has changed. copy paste error from previous lines? regards sudip -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 07/20] staging: rtl8192u: r8192_core: whitespace neatening
Signed-off-by: Raphaël Beamonte
---
drivers/staging/rtl8192u/r8192U_core.c | 270 -
1 file changed, 135 insertions(+), 135 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c
b/drivers/staging/rtl8192u/r8192U_core.c
index b204782..7d3a626 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -37,17 +37,17 @@ unsigned int __fixunsdfsi(double d)
double __adddf3(double a, double b)
{
- return a+b;
+ return a + b;
}
double __addsf3(float a, float b)
{
- return a+b;
+ return a + b;
}
double __subdf3(double a, double b)
{
- return a-b;
+ return a - b;
}
double __extendsfdf2(float a)
@@ -114,9 +114,9 @@ static int channels = 0x3fff;
-module_param(ifname, charp, S_IRUGO|S_IWUSR);
-module_param(hwwep, int, S_IRUGO|S_IWUSR);
-module_param(channels, int, S_IRUGO|S_IWUSR);
+module_param(ifname, charp, S_IRUGO | S_IWUSR);
+module_param(hwwep, int, S_IRUGO | S_IWUSR);
+module_param(channels, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ifname, " Net interface name, wlan%d=default");
MODULE_PARM_DESC(hwwep, " Try to use hardware security support. ");
@@ -212,7 +212,7 @@ static void CamResetAllEntry(struct net_device *dev)
//2004/02/11 In static WEP, OID_ADD_KEY or OID_ADD_WEP are set before
STA associate to AP.
// However, ResetKey is called on OID_802_11_INFRASTRUCTURE_MODE and
MlmeAssociateRequest
// In this condition, Cam can not be reset because upper layer will not
set this static key again.
- ulcommand |= BIT31|BIT30;
+ ulcommand |= BIT31 | BIT30;
write_nic_dword(dev, RWCAM, ulcommand);
}
@@ -221,14 +221,14 @@ static void CamResetAllEntry(struct net_device *dev)
void write_cam(struct net_device *dev, u8 addr, u32 data)
{
write_nic_dword(dev, WCAMI, data);
- write_nic_dword(dev, RWCAM, BIT31|BIT16|(addr&0xff));
+ write_nic_dword(dev, RWCAM, BIT31 | BIT16 | (addr & 0xff));
}
u32 read_cam(struct net_device *dev, u8 addr)
{
u32 data;
- write_nic_dword(dev, RWCAM, 0x8000|(addr&0xff));
+ write_nic_dword(dev, RWCAM, 0x8000 | (addr & 0xff));
read_nic_dword(dev, 0xa8, );
return data;
}
@@ -241,7 +241,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-indx|0xfe00, 0, , 1, HZ / 2);
+indx | 0xfe00, 0, , 1, HZ / 2);
if (status < 0)
netdev_err(dev, "write_nic_byte_E TimeOut! status: %d\n",
status);
@@ -255,7 +255,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8
*data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-indx|0xfe00, 0, data, 1, HZ / 2);
+indx | 0xfe00, 0, data, 1, HZ / 2);
if (status < 0) {
netdev_err(dev, "%s failure status: %d\n", __func__, status);
@@ -274,7 +274,7 @@ void write_nic_byte(struct net_device *dev, int indx, u8
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-(indx&0xff)|0xff00, (indx>>8)&0x0f, , 1,
HZ / 2);
+(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
, 1, HZ / 2);
if (status < 0)
netdev_err(dev, "write_nic_byte TimeOut! status: %d\n", status);
@@ -293,7 +293,7 @@ void write_nic_word(struct net_device *dev, int indx, u16
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-(indx&0xff)|0xff00, (indx>>8)&0x0f, , 2,
HZ / 2);
+(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
, 2, HZ / 2);
if (status < 0)
netdev_err(dev, "write_nic_word TimeOut! status: %d\n", status);
@@ -311,7 +311,7 @@ void write_nic_dword(struct net_device *dev, int indx, u32
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-(indx&0xff)|0xff00, (indx>>8)&0x0f, , 4,
HZ / 2);
+(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
, 4, HZ / 2);
if (status < 0)
@@ -329,7 +329,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8
*data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-(indx&0xff)|0xff00, (indx>>8)&0x0f, data, 1,
HZ / 2);
+
[PATCH 07/20] staging: rtl8192u: r8192_core: whitespace neatening
Signed-off-by: Raphaël Beamonte raphael.beamo...@gmail.com
---
drivers/staging/rtl8192u/r8192U_core.c | 270 -
1 file changed, 135 insertions(+), 135 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c
b/drivers/staging/rtl8192u/r8192U_core.c
index b204782..7d3a626 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -37,17 +37,17 @@ unsigned int __fixunsdfsi(double d)
double __adddf3(double a, double b)
{
- return a+b;
+ return a + b;
}
double __addsf3(float a, float b)
{
- return a+b;
+ return a + b;
}
double __subdf3(double a, double b)
{
- return a-b;
+ return a - b;
}
double __extendsfdf2(float a)
@@ -114,9 +114,9 @@ static int channels = 0x3fff;
-module_param(ifname, charp, S_IRUGO|S_IWUSR);
-module_param(hwwep, int, S_IRUGO|S_IWUSR);
-module_param(channels, int, S_IRUGO|S_IWUSR);
+module_param(ifname, charp, S_IRUGO | S_IWUSR);
+module_param(hwwep, int, S_IRUGO | S_IWUSR);
+module_param(channels, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ifname, Net interface name, wlan%d=default);
MODULE_PARM_DESC(hwwep, Try to use hardware security support. );
@@ -212,7 +212,7 @@ static void CamResetAllEntry(struct net_device *dev)
//2004/02/11 In static WEP, OID_ADD_KEY or OID_ADD_WEP are set before
STA associate to AP.
// However, ResetKey is called on OID_802_11_INFRASTRUCTURE_MODE and
MlmeAssociateRequest
// In this condition, Cam can not be reset because upper layer will not
set this static key again.
- ulcommand |= BIT31|BIT30;
+ ulcommand |= BIT31 | BIT30;
write_nic_dword(dev, RWCAM, ulcommand);
}
@@ -221,14 +221,14 @@ static void CamResetAllEntry(struct net_device *dev)
void write_cam(struct net_device *dev, u8 addr, u32 data)
{
write_nic_dword(dev, WCAMI, data);
- write_nic_dword(dev, RWCAM, BIT31|BIT16|(addr0xff));
+ write_nic_dword(dev, RWCAM, BIT31 | BIT16 | (addr 0xff));
}
u32 read_cam(struct net_device *dev, u8 addr)
{
u32 data;
- write_nic_dword(dev, RWCAM, 0x8000|(addr0xff));
+ write_nic_dword(dev, RWCAM, 0x8000 | (addr 0xff));
read_nic_dword(dev, 0xa8, data);
return data;
}
@@ -241,7 +241,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-indx|0xfe00, 0, data, 1, HZ / 2);
+indx | 0xfe00, 0, data, 1, HZ / 2);
if (status 0)
netdev_err(dev, write_nic_byte_E TimeOut! status: %d\n,
status);
@@ -255,7 +255,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8
*data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-indx|0xfe00, 0, data, 1, HZ / 2);
+indx | 0xfe00, 0, data, 1, HZ / 2);
if (status 0) {
netdev_err(dev, %s failure status: %d\n, __func__, status);
@@ -274,7 +274,7 @@ void write_nic_byte(struct net_device *dev, int indx, u8
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-(indx0xff)|0xff00, (indx8)0x0f, data, 1,
HZ / 2);
+(indx 0xff) | 0xff00, (indx 8) 0x0f,
data, 1, HZ / 2);
if (status 0)
netdev_err(dev, write_nic_byte TimeOut! status: %d\n, status);
@@ -293,7 +293,7 @@ void write_nic_word(struct net_device *dev, int indx, u16
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-(indx0xff)|0xff00, (indx8)0x0f, data, 2,
HZ / 2);
+(indx 0xff) | 0xff00, (indx 8) 0x0f,
data, 2, HZ / 2);
if (status 0)
netdev_err(dev, write_nic_word TimeOut! status: %d\n, status);
@@ -311,7 +311,7 @@ void write_nic_dword(struct net_device *dev, int indx, u32
data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-(indx0xff)|0xff00, (indx8)0x0f, data, 4,
HZ / 2);
+(indx 0xff) | 0xff00, (indx 8) 0x0f,
data, 4, HZ / 2);
if (status 0)
@@ -329,7 +329,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8
*data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-(indx0xff)|0xff00, (indx8)0x0f, data, 1,
HZ / 2);
+
