Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281187
b: refs/heads/master
c: 80c0d83
h: refs/heads/master
i:
  281185: b33ddbc
  281183: d4784d4
v: v3
  • Loading branch information
Sean MacLennan authored and Greg Kroah-Hartman committed Nov 30, 2011
1 parent 183481a commit 304a7f6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 345 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 28998e005bb669b60de0e432d6f142267f5c1403
refs/heads/master: 80c0d83aec528ecfb941af34a38ab065e572679c
18 changes: 1 addition & 17 deletions trunk/drivers/staging/rtl8192e/rtl_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,6 @@ static short rtl8192_init(struct net_device *dev)

memset(&(priv->stats), 0, sizeof(struct rt_stats));

rtl8192_dbgp_flag_init(dev);
rtl8192_init_priv_handler(dev);
rtl8192_init_priv_constant(dev);
rtl8192_init_priv_variable(dev);
Expand Down Expand Up @@ -2960,10 +2959,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,

register_netdev(dev);
RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name);
err = rtl_debug_module_init(priv, dev->name);
if (err)
RT_TRACE(COMP_DBG, "failed to create debugfs files. Ignoring "
"error: %d\n", err);

rtl8192_proc_init_one(dev);

if (priv->polling_timer_on == 0)
Expand Down Expand Up @@ -3001,7 +2997,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
del_timer_sync(&priv->gpio_polling_timer);
cancel_delayed_work(&priv->gpio_change_rf_wq);
priv->polling_timer_on = 0;
rtl_debug_module_remove(priv);
rtl8192_proc_remove_one(dev);
rtl8192_down(dev, true);
deinit_hal_dm(dev);
Expand Down Expand Up @@ -3090,7 +3085,6 @@ bool NicIFDisableNIC(struct net_device *dev)
static int __init rtl8192_pci_module_init(void)
{
int ret;
int error;

ret = rtllib_init();
if (ret) {
Expand Down Expand Up @@ -3120,22 +3114,13 @@ static int __init rtl8192_pci_module_init(void)
printk(KERN_INFO "\nLinux kernel driver for RTL8192E WLAN cards\n");
printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan Driver\n");

error = rtl_create_debugfs_root();
if (error) {
RT_TRACE(COMP_DBG, "Create debugfs root fail: %d\n", error);
goto err_out;
}

rtl8192_proc_module_init();
if (0 != pci_register_driver(&rtl8192_pci_driver)) {
DMESG("No device found");
/*pci_unregister_driver (&rtl8192_pci_driver);*/
return -ENODEV;
}
return 0;
err_out:
return error;

}

static void __exit rtl8192_pci_module_exit(void)
Expand All @@ -3144,7 +3129,6 @@ static void __exit rtl8192_pci_module_exit(void)

RT_TRACE(COMP_DOWN, "Exiting");
rtl8192_proc_module_remove();
rtl_remove_debugfs_root();
rtllib_crypto_tkip_exit();
rtllib_crypto_ccmp_exit();
rtllib_crypto_wep_exit();
Expand Down
76 changes: 0 additions & 76 deletions trunk/drivers/staging/rtl8192e/rtl_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
* Contact Information:
* wlanfae <wlanfae@realtek.com>
******************************************************************************/
#include "rtl_debug.h"
#include "rtl_core.h"
#include "r8192E_phy.h"
#include "r8192E_phyreg.h"
Expand All @@ -32,81 +31,6 @@
u32 rt_global_debug_component = \
COMP_ERR ;

/*------------------Declare variable-----------------------*/
u32 DBGP_Type[DBGP_TYPE_MAX];

/*-----------------------------------------------------------------------------
* Function: DBGP_Flag_Init
*
* Overview: Refresh all debug print control flag content to zero.
*
* Input: NONE
*
* Output: NONE
*
* Return: NONE
*
* Revised History:
* When Who Remark
* 10/20/2006 MHC Create Version 0.
*
*---------------------------------------------------------------------------*/
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 */

/* this is only for debugging */
void print_buffer(u32 *buffer, int len)
{
int i;
u8 *buf = (u8 *)buffer;

printk(KERN_INFO "ASCII BUFFER DUMP (len: %x):\n", len);

for (i = 0; i < len; i++)
printk(KERN_INFO "%c", buf[i]);

printk(KERN_INFO "\nBINARY BUFFER DUMP (len: %x):\n", len);

for (i = 0; i < len; i++)
printk(KERN_INFO "%x", buf[i]);

printk(KERN_INFO "\n");
}

/* this is only for debug */
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));
}

/* this is only for debug */
void rtl8192_dump_reg(struct net_device *dev)
{
int i;
int n;
int max = 0x5ff;

RT_TRACE(COMP_INIT, "Dumping NIC register map");

for (n = 0; n <= max; ) {
printk(KERN_INFO "\nD: %2x> ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
printk(KERN_INFO "%2x ", read_nic_byte(dev, n));
}
printk(KERN_INFO "\n");
}

/****************************************************************************
-----------------------------PROCFS STUFF-------------------------
*****************************************************************************/
Expand Down
Loading

0 comments on commit 304a7f6

Please sign in to comment.