lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Larry Finger
2011-08-25 11:48:21 -05:00
committed by Greg Kroah-Hartman
parent 1344ee2591
commit cffa5bd956
3 changed files with 511 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/rtl8192e/rtl_crypto.h
View File

@@ -22,7 +22,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/errno.h> #include <linux/errno.h>
#define crypto_register_alg crypto_register_alg_rsl #define crypto_register_alg crypto_register_alg_rsl
#define crypto_unregister_alg crypto_unregister_alg_rsl #define crypto_unregister_alg crypto_unregister_alg_rsl

618
drivers/staging/rtl8192e/rtl_debug.c
View File

File diff suppressed because it is too large Load Diff

108
drivers/staging/rtl8192e/rtl_debug.h
View File

@@ -36,9 +36,8 @@ struct net_device;
#define DBG_LOUD 4 #define DBG_LOUD 4
#define RT_ASSERT(_Exp,Fmt) \ #define RT_ASSERT(_Exp, Fmt) \
if (!(_Exp)) \ if (!(_Exp)) { \
{ \
printk("Rtl819x: "); \ printk("Rtl819x: "); \
printk Fmt; \ printk Fmt; \
} }
@@ -166,40 +165,39 @@ enum dbgp_flag {
#if (DEBUG_PRINT == 1) #if (DEBUG_PRINT == 1)
#define RTPRINT(dbgtype, dbgflag, printstr) \ #define RTPRINT(dbgtype, dbgflag, printstr) \
{ \ { \
if (DBGP_Type[dbgtype] & dbgflag)\ if (DBGP_Type[dbgtype] & dbgflag) { \
{ \
printk printstr; \ printk printstr; \
} \ } \
} }
#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)\ #define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) \
{\ { \
if (DBGP_Type[dbgtype] & dbgflag)\ if (DBGP_Type[dbgtype] & dbgflag) { \
{\
int __i; \ int __i; \
u8* ptr = (u8*)_Ptr; \ u8 *ptr = (u8 *)_Ptr; \
printk printstr; \ printk printstr; \
printk(" "); \ printk(" "); \
for ( __i=0; __i<6; __i++ ) \ for (__i = 0; __i < 6; __i++) \
printk("%02X%s", ptr[__i], (__i==5)?"":"-"); \ printk("%02X%s", ptr[__i], \
(__i == 5) ? "" : "-"); \
printk("\n"); \ printk("\n"); \
}\ } \
} }
#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\ #define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\
{\ { \
if (DBGP_Type[dbgtype] & dbgflag)\ if (DBGP_Type[dbgtype] & dbgflag) { \
{\
int __i; \ int __i; \
u8* ptr = (u8*)_HexData; \ u8 *ptr = (u8 *)_HexData; \
printk(_TitleString); \ printk(_TitleString); \
for ( __i=0; __i<(int)_HexDataLen; __i++ ) \ for (__i = 0; __i < (int)_HexDataLen; __i++) { \
{ \ printk("%02X%s", ptr[__i], (((__i + 1) \
printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" ");\ % 4) == 0) ? " " : " "); \
if (((__i + 1) % 16) == 0) printk("\n");\ if (((__i + 1) % 16) == 0) \
printk("\n"); \
} \ } \
printk("\n"); \ printk("\n"); \
}\ } \
} }
#else #else
#define RTPRINT(dbgtype, dbgflag, printstr) #define RTPRINT(dbgtype, dbgflag, printstr)
@@ -211,49 +209,51 @@ 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 {\ do {\
if (((_Comp) & rt_global_debug_component ) && (_Level <= rt_global_debug_component )) \ if (((_Comp) & rt_global_debug_component) && \
{ \ (_Level <= rt_global_debug_component)) { \
int __i; \ int __i; \
u8* ptr = (u8*)_HexData; \ u8* ptr = (u8 *)_HexData; \
printk("Rtl819x: "); \ printk(KERN_INFO "Rtl819x: "); \
printk(_TitleString); \ printk(_TitleString); \
for ( __i=0; __i<(int)_HexDataLen; __i++ ) \ for (__i = 0; __i < (int)_HexDataLen; __i++) { \
{ \ printk("%02X%s", ptr[__i], (((__i + 1) % \
printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" "); \ 4) == 0) ? " " : " "); \
if (((__i + 1) % 16) == 0) printk("\n"); \ if (((__i + 1) % 16) == 0) \
printk("\n"); \
} \ } \
printk("\n"); \ printk("\n"); \
} \ } \
}while(0); } while (0);
#define DMESG(x,a...) #define DMESG(x, a...)
#define DMESGW(x,a...) #define DMESGW(x, a...)
#define DMESGE(x,a...) #define DMESGE(x, a...)
extern u32 rt_global_debug_component; extern u32 rt_global_debug_component;
#define RT_TRACE(component, x, args...) \ #define RT_TRACE(component, x, args...) \
do { if (rt_global_debug_component & component) \ do { \
if (rt_global_debug_component & component) \
printk(KERN_DEBUG DRV_NAME ":" x "\n" , \ printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
##args);\ ##args);\
}while(0); } while (0);
#define assert(expr) \ #define assert(expr) \
if (!(expr)) { \ if (!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n", \ printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
#expr,__FILE__,__func__,__LINE__); \ #expr, __FILE__, __func__, __LINE__); \
} }
#define RT_DEBUG_DATA(level, data, datalen) \ #define RT_DEBUG_DATA(level, data, datalen) \
do{ if ((rt_global_debug_component & (level)) == (level)) \ do { \
{ \ if ((rt_global_debug_component & (level)) == (level)) {\
int _i; \ int _i; \
u8* _pdata = (u8*) data; \ u8 *_pdata = (u8 *)data; \
printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \ printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \
for (_i=0; _i<(int)(datalen); _i++) \ for (_i = 0; _i < (int)(datalen); _i++) { \
{ \ printk(KERN_INFO "%2x ", _pdata[_i]); \
printk("%2x ", _pdata[_i]); \ if ((_i+1) % 16 == 0) \
if ((_i+1)%16 == 0) printk("\n"); \
} \
printk("\n"); \ printk("\n"); \
} \ } \
printk(KERN_INFO "\n"); \
} \
} while (0) } while (0)
struct rtl_fs_debug { struct rtl_fs_debug {
@@ -270,16 +270,23 @@ void dump_eprom(struct net_device *dev);
void rtl8192_dump_reg(struct net_device *dev); void rtl8192_dump_reg(struct net_device *dev);
/* debugfs stuff */ /* 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; 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; return 0;
} }
static inline void rtl_remove_debugfs_root(void) {
static inline void rtl_remove_debugfs_root(void)
{
} }
/* proc stuff */ /* 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_init(void);
void rtl8192_proc_module_remove(void); void rtl8192_proc_module_remove(void);
void rtl8192_dbgp_flag_init(struct net_device *dev); void rtl8192_dbgp_flag_init(struct net_device *dev);
#endif #endif