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/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

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

@@ -56,9 +56,7 @@ void rtl8192_dbgp_flag_init(struct net_device *dev)
u8 i;
for (i = 0; i < DBGP_TYPE_MAX; i++)
{
DBGP_Type[i] = 0;
}
} /* DBGP_Flag_Init */
@@ -69,17 +67,17 @@ void print_buffer(u32 *buffer, int len)
int i;
u8 *buf = (u8 *)buffer;
printk("ASCII BUFFER DUMP (len: %x):\n",len);
printk(KERN_INFO "ASCII BUFFER DUMP (len: %x):\n", len);
for (i = 0; i < len; i++)
printk("%c",buf[i]);
printk(KERN_INFO "%c", buf[i]);
printk("\nBINARY BUFFER DUMP (len: %x):\n",len);
printk(KERN_INFO "\nBINARY BUFFER DUMP (len: %x):\n", len);
for (i = 0; i < len; i++)
printk("%x",buf[i]);
printk(KERN_INFO "%x", buf[i]);
printk("\n");
printk(KERN_INFO "\n");
}
/* this is only for debug */
@@ -87,9 +85,9 @@ void dump_eprom(struct net_device *dev)
{
int i;
for (i = 0; i < 0xff; i++) {
RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i, eprom_read(dev,i));
}
for (i = 0; i < 0xff; i++)
RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i,
eprom_read(dev, i));
}
/* this is only for debug */
@@ -102,18 +100,18 @@ void rtl8192_dump_reg(struct net_device *dev)
RT_TRACE(COMP_INIT, "Dumping NIC register map");
for (n = 0; n <= max; ) {
printk( "\nD: %2x> ", n);
printk(KERN_INFO "\nD: %2x> ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
printk("%2x ", read_nic_byte(dev, n));
printk(KERN_INFO "%2x ", read_nic_byte(dev, n));
}
printk("\n");
printk(KERN_INFO "\n");
}
/****************************************************************************
-----------------------------PROCFS STUFF-------------------------
*****************************************************************************/
/*This part is related to PROC, which will record some statistics. */
static struct proc_dir_entry *rtl8192_proc = NULL;
static struct proc_dir_entry *rtl8192_proc;
static int proc_get_stats_ap(char *page, char **start,
off_t offset, int count,
@@ -123,7 +121,6 @@ static int proc_get_stats_ap(char *page, char **start,
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib;
struct rtllib_network *target;
int len = 0;
list_for_each_entry(target, &ieee->network_list, list) {
@@ -131,14 +128,12 @@ static int proc_get_stats_ap(char *page, char **start,
len += snprintf(page + len, count - len,
"%s ", target->ssid);
if (target->wpa_ie_len>0 || target->rsn_ie_len>0){
if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0)
len += snprintf(page + len, count - len,
"WPA\n");
}
else{
else
len += snprintf(page + len, count - len,
"non_WPA\n");
}
}
@@ -158,18 +153,18 @@ static int proc_get_registers_0(char *page, char **start,
int max = 0xff;
page0 = 0x000;
{
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0>>8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
"0C 0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; n++, i++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
}
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -190,16 +185,18 @@ static int proc_get_registers_1(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0>>8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
"0C 0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -220,16 +217,18 @@ static int proc_get_registers_2(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0 >> 8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C "
"0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -250,16 +249,18 @@ static int proc_get_registers_3(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0>>8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
"0C 0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -280,16 +281,18 @@ static int proc_get_registers_4(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0>>8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
"0C 0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -310,16 +313,18 @@ static int proc_get_registers_5(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0 >> 8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
"0C 0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -340,16 +345,18 @@ static int proc_get_registers_6(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0>>8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
"0C 0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -370,16 +377,18 @@ static int proc_get_registers_7(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
"\n####################page %x##################\n ",
(page0 >> 8));
len += snprintf(page + len, count - len,
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (n=0;n<=max;)
{
"\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C "
"0D 0E 0F");
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
"\nD: %2x > ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
"%2.2x ",read_nic_byte(dev,(page0|n)));
"%2.2x ", read_nic_byte(dev,
(page0 | n)));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -400,13 +409,14 @@ static int proc_get_registers_8(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0 >> 8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -427,13 +437,14 @@ static int proc_get_registers_9(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0>>8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -453,13 +464,14 @@ static int proc_get_registers_a(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0>>8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -479,13 +491,14 @@ static int proc_get_registers_b(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0 >> 8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -505,13 +518,14 @@ static int proc_get_registers_c(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0>>8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -531,13 +545,14 @@ static int proc_get_registers_d(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0>>8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -557,13 +572,14 @@ static int proc_get_registers_e(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n####################page %x##################\n ", (page0>>8));
for (n=0;n<=max;)
{
"\n####################page %x##################\n",
(page0>>8));
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
"%8.8x ", rtl8192_QueryBBReg(dev,
(page0 | n), bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -584,12 +600,13 @@ static int proc_get_reg_rf_a(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-A ##################\n ");
for (n=0;n<=max;)
{
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_A,n, bMaskDWord));
"%8.8x ", rtl8192_phy_QueryRFReg(dev,
(enum rf90_radio_path)RF90_PATH_A, n,
bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -610,12 +627,13 @@ static int proc_get_reg_rf_b(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-B ##################\n ");
for (n=0;n<=max;)
{
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_B, n, bMaskDWord));
"%8.8x ", rtl8192_phy_QueryRFReg(dev,
(enum rf90_radio_path)RF90_PATH_B, n,
bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -636,12 +654,13 @@ static int proc_get_reg_rf_c(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-C ##################\n");
for (n=0;n<=max;)
{
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_C, n, bMaskDWord));
"%8.8x ", rtl8192_phy_QueryRFReg(dev,
(enum rf90_radio_path)RF90_PATH_C, n,
bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -662,12 +681,13 @@ static int proc_get_reg_rf_d(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-D ##################\n ");
for (n=0;n<=max;)
{
for (n = 0; n <= max;) {
len += snprintf(page + len, count - len, "\nD: %2x > ", n);
for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_D, n, bMaskDWord));
"%8.8x ", rtl8192_phy_QueryRFReg(dev,
(enum rf90_radio_path)RF90_PATH_D, n,
bMaskDWord));
}
len += snprintf(page + len, count - len, "\n");
*eof = 1;
@@ -688,28 +708,25 @@ static int proc_get_cam_register_1(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### SECURITY CAM (0-10) ##################\n ");
for (j=0; j<11; j++)
{
"\n#################### SECURITY CAM (0-10) ######"
"############\n ");
for (j = 0; j < 11; j++) {
len += snprintf(page + len, count - len, "\nD: %2x > ", j);
for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
{
for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
target_command = entry_i+CAM_CONTENT_COUNT*j;
target_command = target_command | BIT31;
while((i--)>=0)
{
while ((i--) >= 0) {
ulStatus = read_nic_dword(dev, RWCAM);
if (ulStatus & BIT31){
if (ulStatus & BIT31)
continue;
}
else{
else
break;
}
}
write_nic_dword(dev, RWCAM, target_command);
target_content = read_nic_dword(dev, RCAMO);
len += snprintf(page + len, count - len,"%8.8x ",target_content);
len += snprintf(page + len, count - len, "%8.8x ",
target_content);
}
}
@@ -732,28 +749,25 @@ static int proc_get_cam_register_2(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### SECURITY CAM (11-21) ##################\n ");
for (j=11; j<22; j++)
{
"\n#################### SECURITY CAM (11-21) "
"##################\n ");
for (j = 11; j < 22; j++) {
len += snprintf(page + len, count - len, "\nD: %2x > ", j);
for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
{
for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
target_command = entry_i + CAM_CONTENT_COUNT * j;
target_command = target_command | BIT31;
while((i--)>=0)
{
while ((i--) >= 0) {
ulStatus = read_nic_dword(dev, RWCAM);
if (ulStatus & BIT31){
if (ulStatus & BIT31)
continue;
}
else{
else
break;
}
}
write_nic_dword(dev, RWCAM, target_command);
target_content = read_nic_dword(dev, RCAMO);
len += snprintf(page + len, count - len,"%8.8x ",target_content);
len += snprintf(page + len, count - len, "%8.8x ",
target_content);
}
}
@@ -776,28 +790,25 @@ static int proc_get_cam_register_3(char *page, char **start,
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### SECURITY CAM (22-31) ##################\n ");
for (j=22; j<TOTAL_CAM_ENTRY; j++)
{
"\n#################### SECURITY CAM (22-31) ######"
"############\n ");
for (j = 22; j < TOTAL_CAM_ENTRY; j++) {
len += snprintf(page + len, count - len, "\nD: %2x > ", j);
for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
{
for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
target_command = entry_i + CAM_CONTENT_COUNT * j;
target_command = target_command | BIT31;
while((i--)>=0)
{
while ((i--) >= 0) {
ulStatus = read_nic_dword(dev, RWCAM);
if (ulStatus & BIT31){
if (ulStatus & BIT31)
continue;
}
else{
else
break;
}
}
write_nic_dword(dev, RWCAM, target_command);
target_content = read_nic_dword(dev, RCAMO);
len += snprintf(page + len, count - len,"%8.8x ",target_content);
len += snprintf(page + len, count - len, "%8.8x ",
target_content);
}
}
@@ -891,7 +902,7 @@ void rtl8192_proc_remove_one(struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
printk("dev name %s\n",dev->name);
printk(KERN_INFO "dev name %s\n", dev->name);
if (priv->dir_dev) {
remove_proc_entry("stats-tx", priv->dir_dev);
@@ -929,194 +940,169 @@ void rtl8192_proc_init_one(struct net_device *dev)
{
struct proc_dir_entry *e;
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
priv->dir_dev = create_proc_entry(dev->name,
S_IFDIR | S_IRUGO | S_IXUGO,
rtl8192_proc);
if (!priv->dir_dev) {
RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
dev->name);
RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192"
"/%s\n", dev->name);
return;
}
e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_stats_rx, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/stats-rx\n",
dev->name);
}
e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_stats_tx, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/stats-tx\n",
dev->name);
}
e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_stats_ap, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/stats-ap\n",
dev->name);
}
e = create_proc_read_entry("registers-0", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_0, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-0\n",
dev->name);
}
e = create_proc_read_entry("registers-1", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_1, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-1\n",
dev->name);
}
e = create_proc_read_entry("registers-2", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_2, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-2\n",
dev->name);
}
e = create_proc_read_entry("registers-3", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_3, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-3\n",
dev->name);
}
e = create_proc_read_entry("registers-4", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_4, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-4\n",
dev->name);
}
e = create_proc_read_entry("registers-5", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_5, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-5\n",
dev->name);
}
e = create_proc_read_entry("registers-6", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_6, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-6\n",
dev->name);
}
e = create_proc_read_entry("registers-7", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_7, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-7\n",
dev->name);
}
e = create_proc_read_entry("registers-8", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_8, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-8\n",
dev->name);
}
e = create_proc_read_entry("registers-9", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_9, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-9\n",
dev->name);
}
e = create_proc_read_entry("registers-a", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_a, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-a\n",
dev->name);
}
e = create_proc_read_entry("registers-b", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_b, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-b\n",
dev->name);
}
e = create_proc_read_entry("registers-c", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_c, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-c\n",
dev->name);
}
e = create_proc_read_entry("registers-d", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_d, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-d\n",
dev->name);
}
e = create_proc_read_entry("registers-e", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_e, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-e\n",
dev->name);
}
e = create_proc_read_entry("RF-A", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_a, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-A\n",
dev->name);
}
e = create_proc_read_entry("RF-B", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_b, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-B\n",
dev->name);
}
e = create_proc_read_entry("RF-C", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_c, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-C\n",
dev->name);
}
e = create_proc_read_entry("RF-D", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_d, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-D\n",
dev->name);
}
e = create_proc_read_entry("SEC-CAM-1", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_cam_register_1, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/SEC-CAM-1\n",
dev->name);
}
e = create_proc_read_entry("SEC-CAM-2", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_cam_register_2, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/SEC-CAM-2\n",
dev->name);
}
e = create_proc_read_entry("SEC-CAM-3", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_cam_register_3, dev);
if (!e) {
if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/SEC-CAM-3\n",
dev->name);
}
}

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

@@ -37,8 +37,7 @@ struct net_device;
#define DBG_LOUD 4
#define RT_ASSERT(_Exp, Fmt) \
if (!(_Exp)) \
{ \
if (!(_Exp)) { \
printk("Rtl819x: "); \
printk Fmt; \
}
@@ -166,37 +165,36 @@ enum dbgp_flag {
#if (DEBUG_PRINT == 1)
#define RTPRINT(dbgtype, dbgflag, printstr) \
{ \
if (DBGP_Type[dbgtype] & dbgflag)\
{ \
if (DBGP_Type[dbgtype] & dbgflag) { \
printk printstr; \
} \
}
#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) \
{ \
if (DBGP_Type[dbgtype] & dbgflag)\
{\
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("%02X%s", ptr[__i], \
(__i == 5) ? "" : "-"); \
printk("\n"); \
} \
}
#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\
{ \
if (DBGP_Type[dbgtype] & dbgflag)\
{\
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");\
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"); \
} \
@@ -211,16 +209,17 @@ extern u32 DBGP_Type[DBGP_TYPE_MAX];
#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \
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; \
u8* ptr = (u8 *)_HexData; \
printk("Rtl819x: "); \
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"); \
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"); \
} \
@@ -231,29 +230,30 @@ do {\
#define DMESGE(x, a...)
extern u32 rt_global_debug_component;
#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" , \
##args);\
} while (0);
#define assert(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__); \
}
#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; \
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"); \
} \
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 {
@@ -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