rtl8192e: cleanup rtl_debug.h
authorSean MacLennan <seanm@seanm.ca>
Tue, 29 Nov 2011 01:17:10 +0000 (20:17 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 30 Nov 2011 10:39:34 +0000 (19:39 +0900)
This patch cleans up rtl_debug.h by removing all the unused defines and
stub functions.
The changes to rtl_core.c are just to remove the deleted stub function
calls.
The changes to rtl_debug.c are functions that are never called.

Signed-off-by: Sean MacLennan <seanm@seanm.ca>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl_debug.c
drivers/staging/rtl8192e/rtl_debug.h

index b7c6d6b4717303e3f01793707673637716f1c906..ba15422cc5123e8513426a60f91e9293f14e7339 100644 (file)
@@ -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);
@@ -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)
@@ -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);
@@ -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) {
@@ -3120,12 +3114,6 @@ 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");
@@ -3133,9 +3121,6 @@ static int __init rtl8192_pci_module_init(void)
                return -ENODEV;
        }
        return 0;
-err_out:
-       return error;
-
 }
 
 static void __exit rtl8192_pci_module_exit(void)
@@ -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();
index 22bc2dd6e4387aa95650931fc9fc73d5987218aa..e6658d9d20cf20b2fb70adcf21dfafa360f19305 100644 (file)
@@ -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"
 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-------------------------
 *****************************************************************************/
index 50fb9a9b828acce70f438bb61bf50bb247d6043b..e1eac1dbf01aa3fe46e59b7c45ef32df30aafd22 100644 (file)
 ******************************************************************************/
 #ifndef _RTL_DEBUG_H
 #define _RTL_DEBUG_H
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/debugfs.h>
-
-struct r8192_priv;
-struct _tx_desc_8192se;
-struct _TX_DESC_8192CE;
-struct net_device;
-
-#define        DBG_LOUD        4
-
-#define RT_ASSERT(_Exp, Fmt)                           \
-               if (!(_Exp)) {                          \
-                       printk("Rtl819x: ");            \
-                       printk Fmt;                     \
-               }
-
-enum dbgp_flag {
-       FQoS                            = 0,
-       FTX                             = 1,
-       FRX                             = 2,
-       FSEC                            = 3,
-       FMGNT                           = 4,
-       FMLME                           = 5,
-       FRESOURCE                       = 6,
-       FBEACON                         = 7,
-       FISR                            = 8,
-       FPHY                            = 9,
-       FMP                             = 10,
-       FEEPROM                         = 11,
-       FPWR                            = 12,
-       FDM                             = 13,
-       FDBGCtrl                        = 14,
-       FC2H                            = 15,
-       FBT                             = 16,
-       FINIT                           = 17,
-       FIOCTL                          = 18,
-       DBGP_TYPE_MAX
-};
-
-#define                QoS_INIT                                BIT0
-#define                QoS_VISTA                               BIT1
-
-#define                TX_DESC                                 BIT0
-#define                TX_DESC_TID                             BIT1
-
-#define                RX_DATA                                 BIT0
-#define                RX_PHY_STS                              BIT1
-#define                RX_PHY_SS                               BIT2
-#define                RX_PHY_SQ                               BIT3
-#define                RX_PHY_ASTS                             BIT4
-#define                RX_ERR_LEN                              BIT5
-#define                RX_DEFRAG                               BIT6
-#define                RX_ERR_RATE                             BIT7
-
-
-
-#define                MEDIA_STS                               BIT0
-#define                LINK_STS                                BIT1
-
-#define                OS_CHK                                  BIT0
-
-#define                BCN_SHOW                                BIT0
-#define                BCN_PEER                                BIT1
-
-#define                ISR_CHK                                 BIT0
-
-#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                MP_RX                                   BIT0
-#define                MP_SWICH_CH                             BIT1
-
-#define                EEPROM_W                                BIT0
-#define                EFUSE_PG                                BIT1
-#define                EFUSE_READ_ALL                          BIT2
-
-#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_Monitor                              BIT2
-#define                DM_DIG                                  BIT3
-#define                DM_EDCA_Turbo                           BIT4
-
-#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                BT_TRACE                                BIT0
-#define                BT_RFPoll                               BIT1
-
-#define                INIT_EEPROM                             BIT0
-#define                INIT_TxPower                            BIT1
-#define                INIT_IQK                                BIT2
-#define                INIT_RF                                 BIT3
-
-#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_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
-
-/* 2007/07/13 MH  ------For DeBuG Print modeue------*/
-/*------------------------------Define structure----------------------------*/
-
-
-/*------------------------Export Marco Definition---------------------------*/
-#define                DEBUG_PRINT             1
-
-#if (DEBUG_PRINT == 1)
-#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_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");                                   \
-       }                                                       \
-}
-#else
-#define        RTPRINT(dbgtype, dbgflag, printstr)
-#define        RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)
-#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) \
-do {\
-       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);
 
 #define DMESG(x, a...)
-#define DMESGW(x, a...)
-#define DMESGE(x, a...)
+
 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) \
                printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
@@ -241,59 +41,11 @@ do {                       \
                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(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;
-       struct dentry *dir_drv;
-       struct dentry *debug_register;
-       u32 hw_type;
-       u32 hw_offset;
-       bool hw_holding;
-};
-
-void print_buffer(u32 *buffer, int len);
-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)
-{
-       return 0;
-}
-
-static inline void rtl_debug_module_remove(struct r8192_priv *priv)
-{
-}
-
-static inline int rtl_create_debugfs_root(void)
-{
-       return 0;
-}
-
-static inline void rtl_remove_debugfs_root(void)
-{
-}
 
 /* proc stuff */
 void rtl8192_proc_init_one(struct net_device *dev);
 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