staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/rtl8192e/rtl_crypto.h

@@ -22,7 +22,7 @@
 #include <linux/list.h>
 #include <linux/string.h>
 #include <asm/page.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 
 #define crypto_register_alg crypto_register_alg_rsl
 #define crypto_unregister_alg crypto_unregister_alg_rsl
@@ -73,7 +73,7 @@ struct cipher_alg {
 	unsigned int cia_min_keysize;
 	unsigned int cia_max_keysize;
 	int (*cia_setkey)(void *ctx, const u8 *key,
-	                  unsigned int keylen, u32 *flags);
+			  unsigned int keylen, u32 *flags);
 	void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);
 	void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);
 };
@@ -84,16 +84,16 @@ struct digest_alg {
 	void (*dia_update)(void *ctx, const u8 *data, unsigned int len);
 	void (*dia_final)(void *ctx, u8 *out);
 	int (*dia_setkey)(void *ctx, const u8 *key,
-	                  unsigned int keylen, u32 *flags);
+			  unsigned int keylen, u32 *flags);
 };
 
 struct compress_alg {
 	int (*coa_init)(void *ctx);
 	void (*coa_exit)(void *ctx);
 	int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen,
-	                    u8 *dst, unsigned int *dlen);
+			    u8 *dst, unsigned int *dlen);
 	int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen,
-	                      u8 *dst, unsigned int *dlen);
+			      u8 *dst, unsigned int *dlen);
 };
 
 #define cra_cipher	cra_u.cipher
@@ -139,15 +139,15 @@ struct cipher_tfm {
 	unsigned int cit_ivsize;
 	u32 cit_mode;
 	int (*cit_setkey)(struct crypto_tfm *tfm,
-	                  const u8 *key, unsigned int keylen);
+			  const u8 *key, unsigned int keylen);
 	int (*cit_encrypt)(struct crypto_tfm *tfm,
 			   struct scatterlist *dst,
 			   struct scatterlist *src,
 			   unsigned int nbytes);
 	int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
-	                      struct scatterlist *dst,
-	                      struct scatterlist *src,
-	                      unsigned int nbytes, u8 *iv);
+			      struct scatterlist *dst,
+			      struct scatterlist *src,
+			      unsigned int nbytes, u8 *iv);
 	int (*cit_decrypt)(struct crypto_tfm *tfm,
 			   struct scatterlist *dst,
 			   struct scatterlist *src,
@@ -162,21 +162,21 @@ struct cipher_tfm {
 struct digest_tfm {
 	void (*dit_init)(struct crypto_tfm *tfm);
 	void (*dit_update)(struct crypto_tfm *tfm,
-	                   struct scatterlist *sg, unsigned int nsg);
+			   struct scatterlist *sg, unsigned int nsg);
 	void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
 	void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
-	                   unsigned int nsg, u8 *out);
+			   unsigned int nsg, u8 *out);
 	int (*dit_setkey)(struct crypto_tfm *tfm,
-	                  const u8 *key, unsigned int keylen);
+			  const u8 *key, unsigned int keylen);
 };
 
 struct compress_tfm {
 	int (*cot_compress)(struct crypto_tfm *tfm,
-	                    const u8 *src, unsigned int slen,
-	                    u8 *dst, unsigned int *dlen);
+			    const u8 *src, unsigned int slen,
+			    u8 *dst, unsigned int *dlen);
 	int (*cot_decompress)(struct crypto_tfm *tfm,
-	                      const u8 *src, unsigned int slen,
-	                      u8 *dst, unsigned int *dlen);
+			      const u8 *src, unsigned int slen,
+			      u8 *dst, unsigned int *dlen);
 };
 
 #define crt_cipher	crt_u.cipher
@@ -274,8 +274,8 @@ static inline void crypto_digest_init(struct crypto_tfm *tfm)
 }
 
 static inline void crypto_digest_update(struct crypto_tfm *tfm,
-                                        struct scatterlist *sg,
-                                        unsigned int nsg)
+					struct scatterlist *sg,
+					unsigned int nsg)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
 	tfm->crt_digest.dit_update(tfm, sg, nsg);
@@ -288,15 +288,15 @@ static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
 }
 
 static inline void crypto_digest_digest(struct crypto_tfm *tfm,
-                                        struct scatterlist *sg,
-                                        unsigned int nsg, u8 *out)
+					struct scatterlist *sg,
+					unsigned int nsg, u8 *out)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
 	tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
 }
 
 static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
-                                       const u8 *key, unsigned int keylen)
+				       const u8 *key, unsigned int keylen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
 	if (tfm->crt_digest.dit_setkey == NULL)
@@ -305,25 +305,25 @@ static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
 }
 
 static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
-                                       const u8 *key, unsigned int keylen)
+				       const u8 *key, unsigned int keylen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
 }
 
 static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm,
-                                        struct scatterlist *dst,
-                                        struct scatterlist *src,
-                                        unsigned int nbytes)
+					struct scatterlist *dst,
+					struct scatterlist *src,
+					unsigned int nbytes)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes);
 }
 
 static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
-                                           struct scatterlist *dst,
-                                           struct scatterlist *src,
-                                           unsigned int nbytes, u8 *iv)
+					   struct scatterlist *dst,
+					   struct scatterlist *src,
+					   unsigned int nbytes, u8 *iv)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -331,18 +331,18 @@ static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
 }
 
 static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm,
-                                        struct scatterlist *dst,
-                                        struct scatterlist *src,
-                                        unsigned int nbytes)
+					struct scatterlist *dst,
+					struct scatterlist *src,
+					unsigned int nbytes)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes);
 }
 
 static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
-                                           struct scatterlist *dst,
-                                           struct scatterlist *src,
-                                           unsigned int nbytes, u8 *iv)
+					   struct scatterlist *dst,
+					   struct scatterlist *src,
+					   unsigned int nbytes, u8 *iv)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -350,30 +350,30 @@ static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
 }
 
 static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
-                                        const u8 *src, unsigned int len)
+					const u8 *src, unsigned int len)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	memcpy(tfm->crt_cipher.cit_iv, src, len);
 }
 
 static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
-                                        u8 *dst, unsigned int len)
+					u8 *dst, unsigned int len)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	memcpy(dst, tfm->crt_cipher.cit_iv, len);
 }
 
 static inline int crypto_comp_compress(struct crypto_tfm *tfm,
-                                       const u8 *src, unsigned int slen,
-                                       u8 *dst, unsigned int *dlen)
+				       const u8 *src, unsigned int slen,
+				       u8 *dst, unsigned int *dlen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
 	return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
 }
 
 static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
-                                         const u8 *src, unsigned int slen,
-                                         u8 *dst, unsigned int *dlen)
+					 const u8 *src, unsigned int slen,
+					 u8 *dst, unsigned int *dlen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
 	return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);

drivers/staging/rtl8192e/rtl_debug.h

@@ -36,31 +36,30 @@ struct net_device;
 
 #define	DBG_LOUD	4
 
-#define RT_ASSERT(_Exp,Fmt)				\
-		if (!(_Exp))						\
-		{								\
-			printk("Rtl819x: ");				\
-			printk Fmt;					\
+#define RT_ASSERT(_Exp, Fmt)				\
+		if (!(_Exp)) {				\
+			printk("Rtl819x: ");		\
+			printk Fmt;			\
 		}
 
 enum dbgp_flag {
 	FQoS				= 0,
-	FTX					= 1,
-	FRX					= 2,
+	FTX				= 1,
+	FRX				= 2,
 	FSEC				= 3,
 	FMGNT				= 4,
 	FMLME				= 5,
 	FRESOURCE			= 6,
-	FBEACON			= 7,
+	FBEACON				= 7,
 	FISR				= 8,
 	FPHY				= 9,
-	FMP					= 10,
-	FEEPROM			= 11,
+	FMP				= 10,
+	FEEPROM				= 11,
 	FPWR				= 12,
-	FDM					= 13,
-	FDBGCtrl				= 14,
+	FDM				= 13,
+	FDBGCtrl			= 14,
 	FC2H				= 15,
-	FBT					= 16,
+	FBT				= 16,
 	FINIT				= 17,
 	FIOCTL				= 18,
 	DBGP_TYPE_MAX
@@ -76,10 +75,10 @@ enum dbgp_flag {
 #define		RX_PHY_STS				BIT1
 #define		RX_PHY_SS				BIT2
 #define		RX_PHY_SQ				BIT3
-#define		RX_PHY_ASTS			BIT4
+#define		RX_PHY_ASTS				BIT4
 #define		RX_ERR_LEN				BIT5
 #define		RX_DEFRAG				BIT6
-#define		RX_ERR_RATE			BIT7
+#define		RX_ERR_RATE				BIT7
 
 
 
@@ -93,68 +92,68 @@ enum dbgp_flag {
 
 #define		ISR_CHK					BIT0
 
-#define		PHY_BBR				BIT0
-#define		PHY_BBW				BIT1
-#define		PHY_RFR				BIT2
-#define		PHY_RFW				BIT3
+#define		PHY_BBR					BIT0
+#define		PHY_BBW					BIT1
+#define		PHY_RFR					BIT2
+#define		PHY_RFW					BIT3
 #define		PHY_MACR				BIT4
 #define		PHY_MACW				BIT5
 #define		PHY_ALLR				BIT6
 #define		PHY_ALLW				BIT7
 #define		PHY_TXPWR				BIT8
-#define		PHY_PWRDIFF			BIT9
+#define		PHY_PWRDIFF				BIT9
 
 #define		MP_RX					BIT0
-#define		MP_SWICH_CH			BIT1
+#define		MP_SWICH_CH				BIT1
 
 #define		EEPROM_W				BIT0
 #define		EFUSE_PG				BIT1
-#define		EFUSE_READ_ALL			BIT2
+#define		EFUSE_READ_ALL				BIT2
 
-#define		LPS						BIT0
-#define		IPS						BIT1
+#define		LPS					BIT0
+#define		IPS					BIT1
 #define		PWRSW					BIT2
 #define		PWRHW					BIT3
 #define		PWRHAL					BIT4
 
 #define		WA_IOT					BIT0
-#define		DM_PWDB				BIT1
+#define		DM_PWDB					BIT1
 #define		DM_Monitor				BIT2
 #define		DM_DIG					BIT3
-#define		DM_EDCA_Turbo			BIT4
+#define		DM_EDCA_Turbo				BIT4
 
-#define		DbgCtrl_Trace			BIT0
-#define		DbgCtrl_InbandNoise		BIT1
+#define		DbgCtrl_Trace				BIT0
+#define		DbgCtrl_InbandNoise			BIT1
 
 #define		BT_TRACE				BIT0
 #define		BT_RFPoll				BIT1
 
-#define		C2H_Summary			BIT0
-#define		C2H_PacketData			BIT1
-#define		C2H_ContentData			BIT2
+#define		C2H_Summary				BIT0
+#define		C2H_PacketData				BIT1
+#define		C2H_ContentData				BIT2
 #define		BT_TRACE				BIT0
 #define		BT_RFPoll				BIT1
 
 #define		INIT_EEPROM				BIT0
-#define		INIT_TxPower			BIT1
+#define		INIT_TxPower				BIT1
 #define		INIT_IQK				BIT2
 #define		INIT_RF					BIT3
 
-#define		IOCTL_TRACE						BIT0
-#define		IOCTL_BT_EVENT					BIT1
+#define		IOCTL_TRACE				BIT0
+#define		IOCTL_BT_EVENT				BIT1
 #define		IOCTL_BT_EVENT_DETAIL			BIT2
 #define		IOCTL_BT_TX_ACLDATA			BIT3
 #define		IOCTL_BT_TX_ACLDATA_DETAIL		BIT4
 #define		IOCTL_BT_RX_ACLDATA			BIT5
-#define		IOCTL_BT_RX_ACLDATA_DETAIL	BIT6
+#define		IOCTL_BT_RX_ACLDATA_DETAIL		BIT6
 #define		IOCTL_BT_HCICMD				BIT7
 #define		IOCTL_BT_HCICMD_DETAIL			BIT8
-#define		IOCTL_IRP						BIT9
-#define		IOCTL_IRP_DETAIL				BIT10
-#define		IOCTL_CALLBACK_FUN				BIT11
-#define			IOCTL_STATE						BIT12
-#define		IOCTL_BT_TP						BIT13
-#define		IOCTL_BT_LOGO					BIT14
+#define		IOCTL_IRP				BIT9
+#define		IOCTL_IRP_DETAIL			BIT10
+#define		IOCTL_CALLBACK_FUN			BIT11
+#define		IOCTL_STATE				BIT12
+#define		IOCTL_BT_TP				BIT13
+#define		IOCTL_BT_LOGO				BIT14
 
 /* 2007/07/13 MH  ------For DeBuG Print modeue------*/
 /*------------------------------Define structure----------------------------*/
@@ -164,97 +163,98 @@ enum dbgp_flag {
 #define		DEBUG_PRINT		1
 
 #if (DEBUG_PRINT == 1)
-#define RTPRINT(dbgtype, dbgflag, printstr)	\
-{									\
-	if (DBGP_Type[dbgtype] & dbgflag)\
-	{								\
+#define RTPRINT(dbgtype, dbgflag, printstr)			\
+{								\
+	if (DBGP_Type[dbgtype] & dbgflag) {			\
 		printk printstr;				\
-	}								\
+	}							\
 }
 
-#define	RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)\
-{\
-	if (DBGP_Type[dbgtype] & dbgflag)\
-	{\
-				int __i;						\
-				u8*	ptr = (u8*)_Ptr;	\
-				printk printstr;				\
-				printk(" ");					\
-				for ( __i=0; __i<6; __i++ )		\
-					printk("%02X%s", ptr[__i], (__i==5)?"":"-");		\
-				printk("\n");							\
-	}\
+#define	RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)		\
+{								\
+	if (DBGP_Type[dbgtype] & dbgflag) {			\
+		int __i;					\
+		u8 *ptr = (u8 *)_Ptr;				\
+		printk printstr;				\
+		printk(" ");					\
+		for (__i = 0; __i < 6; __i++)			\
+			printk("%02X%s", ptr[__i],		\
+			       (__i == 5) ? "" : "-");		\
+			printk("\n");				\
+	}							\
 }
 
 #define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\
-{\
-	if (DBGP_Type[dbgtype] & dbgflag)\
-	{\
-		int __i;									\
-		u8*	ptr = (u8*)_HexData;			\
-		printk(_TitleString);					\
-		for ( __i=0; __i<(int)_HexDataLen; __i++ )	\
-		{										\
-			printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?"  ":" ");\
-			if (((__i + 1) % 16) == 0)	printk("\n");\
-		}										\
-		printk("\n");							\
-	}\
+{								\
+	if (DBGP_Type[dbgtype] & dbgflag) {			\
+		int __i;					\
+		u8 *ptr = (u8 *)_HexData;			\
+		printk(_TitleString);				\
+		for (__i = 0; __i < (int)_HexDataLen; __i++) {	\
+			printk("%02X%s", ptr[__i], (((__i + 1)	\
+			       % 4) == 0) ? "  " : " ");	\
+			if (((__i + 1) % 16) == 0)		\
+				printk("\n");			\
+		}						\
+		printk("\n");					\
+	}							\
 }
 #else
 #define	RTPRINT(dbgtype, dbgflag, printstr)
 #define	RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)
-#define		RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)
+#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)
 #endif
 
 extern u32	DBGP_Type[DBGP_TYPE_MAX];
 
-#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen)			\
+#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \
 do {\
-	if (((_Comp) & rt_global_debug_component ) && (_Level <= rt_global_debug_component ))	\
-	{									\
-		int __i;								\
-		u8*	ptr = (u8*)_HexData;				\
-		printk("Rtl819x: ");						\
-		printk(_TitleString);						\
-		for ( __i=0; __i<(int)_HexDataLen; __i++ )				\
-		{								\
-			printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?"  ":" ");	\
-			if (((__i + 1) % 16) == 0)	printk("\n");			\
-		}								\
-		printk("\n");							\
+	if (((_Comp) & rt_global_debug_component) &&			\
+	     (_Level <= rt_global_debug_component)) {			\
+		int __i;						\
+		u8*	ptr = (u8 *)_HexData;				\
+		printk(KERN_INFO "Rtl819x: ");				\
+		printk(_TitleString);					\
+		for (__i = 0; __i < (int)_HexDataLen; __i++) {		\
+			printk("%02X%s", ptr[__i], (((__i + 1) %	\
+			       4) == 0) ? "  " : " ");			\
+			if (((__i + 1) % 16) == 0)			\
+				printk("\n");				\
+		}							\
+		printk("\n");						\
 	} \
-}while(0);
+} while (0);
 
-#define DMESG(x,a...)
-#define DMESGW(x,a...)
-#define DMESGE(x,a...)
+#define DMESG(x, a...)
+#define DMESGW(x, a...)
+#define DMESGE(x, a...)
 extern u32 rt_global_debug_component;
 #define RT_TRACE(component, x, args...) \
-do { if (rt_global_debug_component & component) \
-	printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
-	       ##args);\
-}while(0);
+do {			\
+	if (rt_global_debug_component & component) \
+		printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
+		       ##args);\
+} while (0);
 
 #define assert(expr) \
-        if (!(expr)) {                                  \
-                printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-                #expr,__FILE__,__func__,__LINE__);          \
-        }
+	if (!(expr)) {				  \
+		printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
+		#expr, __FILE__, __func__, __LINE__);	  \
+	}
 #define RT_DEBUG_DATA(level, data, datalen)      \
-        do{ if ((rt_global_debug_component & (level)) == (level))   \
-                {       \
-                        int _i;                                  \
-                        u8* _pdata = (u8*) data;                 \
-                        printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__);   \
-                        for (_i=0; _i<(int)(datalen); _i++)                 \
-                        {                                               \
-                                printk("%2x ", _pdata[_i]);               \
-                                if ((_i+1)%16 == 0) printk("\n");        \
-                        }                               \
-                        printk("\n");                   \
-                }                                       \
-        } while (0)
+	do {								\
+		if ((rt_global_debug_component & (level)) == (level)) {\
+			int _i;				  \
+			u8 *_pdata = (u8 *)data;		 \
+			printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__);   \
+			for (_i = 0; _i < (int)(datalen); _i++) {	\
+				printk(KERN_INFO "%2x ", _pdata[_i]);	\
+				if ((_i+1) % 16 == 0)			\
+					printk("\n");			\
+			}			       \
+			printk(KERN_INFO "\n");	  \
+		}				       \
+	} while (0)
 
 struct rtl_fs_debug {
 	const char *name;
@@ -270,16 +270,23 @@ void dump_eprom(struct net_device *dev);
 void rtl8192_dump_reg(struct net_device *dev);
 
 /* debugfs stuff */
-static inline int rtl_debug_module_init(struct r8192_priv *priv, const char *name) {
+static inline int rtl_debug_module_init(struct r8192_priv *priv,
+					const char *name)
+{
 	return 0;
 }
-static inline void rtl_debug_module_remove(struct r8192_priv *priv) {
 
+static inline void rtl_debug_module_remove(struct r8192_priv *priv)
+{
 }
-static inline int rtl_create_debugfs_root(void) {
+
+static inline int rtl_create_debugfs_root(void)
+{
 	return 0;
 }
-static inline void rtl_remove_debugfs_root(void) {
+
+static inline void rtl_remove_debugfs_root(void)
+{
 }
 
 /* proc stuff */
@@ -288,4 +295,5 @@ void rtl8192_proc_remove_one(struct net_device *dev);
 void rtl8192_proc_module_init(void);
 void rtl8192_proc_module_remove(void);
 void rtl8192_dbgp_flag_init(struct net_device *dev);
+
 #endif