Commit 24d73efe authored by Ana Rey's avatar Ana Rey Committed by Greg Kroah-Hartman

staging: rtl8187se: Fixed whitespaces and indentations in r8180.h

This patch fixes whitespaces and converts some indentations to whitespaces and
whitespaces to indentations when it is necessary as the codingStyle of the
 kernel recommends.
Thus, It deletes a lot of errors found by checkpatch.pl in r8180.h
Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7dd1a0a9
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#define RTL8180_MODULE_NAME "r8180" #define RTL8180_MODULE_NAME "r8180"
#define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) #define DMESG(x, a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a)
#define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) #define DMESGW(x, a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a)
#define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) #define DMESGE(x, a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a)
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -84,9 +84,9 @@ typedef struct ChnlAccessSetting { ...@@ -84,9 +84,9 @@ typedef struct ChnlAccessSetting {
u16 EIFS_Timer; u16 EIFS_Timer;
u16 CWminIndex; u16 CWminIndex;
u16 CWmaxIndex; u16 CWmaxIndex;
}*PCHANNEL_ACCESS_SETTING,CHANNEL_ACCESS_SETTING; } *PCHANNEL_ACCESS_SETTING, CHANNEL_ACCESS_SETTING;
typedef enum{ typedef enum {
NIC_8185 = 1, NIC_8185 = 1,
NIC_8185B NIC_8185B
} nic_t; } nic_t;
...@@ -102,20 +102,20 @@ typedef u32 AC_CODING; ...@@ -102,20 +102,20 @@ typedef u32 AC_CODING;
// ECWmin/ECWmax field. // ECWmin/ECWmax field.
// Ref: WMM spec 2.2.2: WME Parameter Element, p.13. // Ref: WMM spec 2.2.2: WME Parameter Element, p.13.
// //
typedef union _ECW{ typedef union _ECW {
u8 charData; u8 charData;
struct struct
{ {
u8 ECWmin:4; u8 ECWmin:4;
u8 ECWmax:4; u8 ECWmax:4;
}f; // Field } f; // Field
}ECW, *PECW; } ECW, *PECW;
// //
// ACI/AIFSN Field. // ACI/AIFSN Field.
// Ref: WMM spec 2.2.2: WME Parameter Element, p.12. // Ref: WMM spec 2.2.2: WME Parameter Element, p.12.
// //
typedef union _ACI_AIFSN{ typedef union _ACI_AIFSN {
u8 charData; u8 charData;
struct struct
...@@ -124,14 +124,14 @@ typedef union _ACI_AIFSN{ ...@@ -124,14 +124,14 @@ typedef union _ACI_AIFSN{
u8 ACM:1; u8 ACM:1;
u8 ACI:2; u8 ACI:2;
u8 Reserved:1; u8 Reserved:1;
}f; // Field } f; // Field
}ACI_AIFSN, *PACI_AIFSN; } ACI_AIFSN, *PACI_AIFSN;
// //
// AC Parameters Record Format. // AC Parameters Record Format.
// Ref: WMM spec 2.2.2: WME Parameter Element, p.12. // Ref: WMM spec 2.2.2: WME Parameter Element, p.12.
// //
typedef union _AC_PARAM{ typedef union _AC_PARAM {
u32 longData; u32 longData;
u8 charData[4]; u8 charData[4];
...@@ -140,8 +140,8 @@ typedef union _AC_PARAM{ ...@@ -140,8 +140,8 @@ typedef union _AC_PARAM{
ACI_AIFSN AciAifsn; ACI_AIFSN AciAifsn;
ECW Ecw; ECW Ecw;
u16 TXOPLimit; u16 TXOPLimit;
}f; // Field } f; // Field
}AC_PARAM, *PAC_PARAM; } AC_PARAM, *PAC_PARAM;
/* it is a wrong definition. -xiong-2006-11-17 /* it is a wrong definition. -xiong-2006-11-17
typedef struct ThreeWireReg { typedef struct ThreeWireReg {
...@@ -155,8 +155,8 @@ typedef struct ThreeWireReg { ...@@ -155,8 +155,8 @@ typedef struct ThreeWireReg {
} ThreeWireReg; } ThreeWireReg;
*/ */
typedef union _ThreeWire{ typedef union _ThreeWire {
struct _ThreeWireStruc{ struct _ThreeWireStruc {
u16 data:1; u16 data:1;
u16 clk:1; u16 clk:1;
u16 enableB:1; u16 enableB:1;
...@@ -165,9 +165,9 @@ typedef union _ThreeWire{ ...@@ -165,9 +165,9 @@ typedef union _ThreeWire{
// u2Byte resv2:14; // u2Byte resv2:14;
// u2Byte ThreeWireEnable:1; // u2Byte ThreeWireEnable:1;
// u2Byte resv3:1; // u2Byte resv3:1;
}struc; } struc;
u16 longData; u16 longData;
}ThreeWireReg; } ThreeWireReg;
typedef struct buffer typedef struct buffer
...@@ -236,7 +236,7 @@ typedef struct _link_detect_t ...@@ -236,7 +236,7 @@ typedef struct _link_detect_t
u32 LastNumRxUnicast; u32 LastNumRxUnicast;
bool bBusyTraffic; //when it is set to 1, UI cann't scan at will. bool bBusyTraffic; //when it is set to 1, UI cann't scan at will.
}link_detect_t, *plink_detect_t; } link_detect_t, *plink_detect_t;
//YJ,modified,080828,end //YJ,modified,080828,end
...@@ -245,14 +245,14 @@ typedef struct _link_detect_t ...@@ -245,14 +245,14 @@ typedef struct _link_detect_t
// LED customization. // LED customization.
//================================================================================ //================================================================================
typedef enum _LED_STRATEGY_8185{ typedef enum _LED_STRATEGY_8185 {
SW_LED_MODE0, // SW_LED_MODE0, //
SW_LED_MODE1, // SW_LED_MODE1, //
HW_LED, // HW control 2 LEDs, LED0 and LED1 (there are 4 different control modes) HW_LED, // HW control 2 LEDs, LED0 and LED1 (there are 4 different control modes)
}LED_STRATEGY_8185, *PLED_STRATEGY_8185; } LED_STRATEGY_8185, *PLED_STRATEGY_8185;
//by amy for led //by amy for led
//by amy for power save //by amy for power save
typedef enum _LED_CTL_MODE{ typedef enum _LED_CTL_MODE {
LED_CTL_POWER_ON = 1, LED_CTL_POWER_ON = 1,
LED_CTL_LINK = 2, LED_CTL_LINK = 2,
LED_CTL_NO_LINK = 3, LED_CTL_NO_LINK = 3,
...@@ -260,16 +260,16 @@ typedef enum _LED_CTL_MODE{ ...@@ -260,16 +260,16 @@ typedef enum _LED_CTL_MODE{
LED_CTL_RX = 5, LED_CTL_RX = 5,
LED_CTL_SITE_SURVEY = 6, LED_CTL_SITE_SURVEY = 6,
LED_CTL_POWER_OFF = 7 LED_CTL_POWER_OFF = 7
}LED_CTL_MODE; } LED_CTL_MODE;
typedef enum _RT_RF_POWER_STATE typedef enum _RT_RF_POWER_STATE
{ {
eRfOn, eRfOn,
eRfSleep, eRfSleep,
eRfOff eRfOff
}RT_RF_POWER_STATE; } RT_RF_POWER_STATE;
enum _ReasonCode{ enum _ReasonCode {
unspec_reason = 0x1, unspec_reason = 0x1,
auth_not_valid = 0x2, auth_not_valid = 0x2,
deauth_lv_ss = 0x3, deauth_lv_ss = 0x3,
...@@ -294,7 +294,7 @@ enum _ReasonCode{ ...@@ -294,7 +294,7 @@ enum _ReasonCode{
invalid_AKMP = 0x14, invalid_AKMP = 0x14,
unsup_RSNIEver = 0x15, unsup_RSNIEver = 0x15,
invalid_RSNIE = 0x16, invalid_RSNIE = 0x16,
auth_802_1x_fail= 0x17, auth_802_1x_fail = 0x17,
ciper_reject = 0x18, ciper_reject = 0x18,
// Reason code defined in 7.3.1.7, 802.1e D13.0, p.42. Added by Annie, 2005-11-15. // Reason code defined in 7.3.1.7, 802.1e D13.0, p.42. Added by Annie, 2005-11-15.
...@@ -305,7 +305,7 @@ enum _ReasonCode{ ...@@ -305,7 +305,7 @@ enum _ReasonCode{
// Where is 36??? // Where is 36???
req_declined = 0x25, // 37 req_declined = 0x25, // 37
invalid_param = 0x26, // 38 invalid_param = 0x26, // 38
req_not_honored= 0x27, // 39 req_not_honored = 0x27, // 39
TS_not_created = 0x2F, // 47 TS_not_created = 0x2F, // 47
DL_not_allowed = 0x30, // 48 DL_not_allowed = 0x30, // 48
dest_not_exist = 0x31, // 49 dest_not_exist = 0x31, // 49
...@@ -316,7 +316,7 @@ typedef enum _RT_PS_MODE ...@@ -316,7 +316,7 @@ typedef enum _RT_PS_MODE
eActive, // Active/Continuous access. eActive, // Active/Continuous access.
eMaxPs, // Max power save mode. eMaxPs, // Max power save mode.
eFastPs // Fast power save mode. eFastPs // Fast power save mode.
}RT_PS_MODE; } RT_PS_MODE;
//by amy for power save //by amy for power save
typedef struct r8180_priv typedef struct r8180_priv
{ {
...@@ -359,8 +359,8 @@ typedef struct r8180_priv ...@@ -359,8 +359,8 @@ typedef struct r8180_priv
short antb; short antb;
short diversity; short diversity;
u32 key0[4]; u32 key0[4];
short (*rf_set_sens)(struct net_device *dev,short sens); short (*rf_set_sens)(struct net_device *dev, short sens);
void (*rf_set_chan)(struct net_device *dev,short ch); void (*rf_set_chan)(struct net_device *dev, short ch);
void (*rf_close)(struct net_device *dev); void (*rf_close)(struct net_device *dev);
void (*rf_init)(struct net_device *dev); void (*rf_init)(struct net_device *dev);
void (*rf_sleep)(struct net_device *dev); void (*rf_sleep)(struct net_device *dev);
...@@ -620,7 +620,7 @@ typedef struct r8180_priv ...@@ -620,7 +620,7 @@ typedef struct r8180_priv
u32 IntrMask; u32 IntrMask;
struct ChnlAccessSetting ChannelAccessSetting; struct ChnlAccessSetting ChannelAccessSetting;
}r8180_priv; } r8180_priv;
#define MANAGE_PRIORITY 0 #define MANAGE_PRIORITY 0
#define BK_PRIORITY 1 #define BK_PRIORITY 1
......
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