Merge remote-tracking branch 'scott/next' into next

[cascardo/linux.git] / drivers / staging / wlags49_h2 / wl_profile.c

diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c
index beabf59..28cc576 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_profile.c
+++ b/drivers/staging/wlags49_h2/wl_profile.c
@@ -101,16 +101,11 @@
 #include <wl_profile.h>
 
 
-/*******************************************************************************
- * global variables
- ******************************************************************************/
-
 /* Definition needed to prevent unresolved external in unistd.h */
 static int errno;
 
 #if DBG
 extern p_u32    DebugFlag;
-extern dbg_info_t *DbgInfo;
 #endif
 
 int parse_yes_no(char *value);
@@ -163,10 +158,6 @@ void parse_config(struct net_device *dev)
        mm_segment_t        fs;
        struct wl_private   *wvlan_config = NULL;
        ENCSTRCT            sEncryption;
-       /*------------------------------------------------------------------------*/
-
-       DBG_FUNC("parse_config");
-       DBG_ENTER(DbgInfo);
 
        /* Get the wavelan specific info for this device */
        wvlan_config = dev->priv;
@@ -272,7 +263,6 @@ void parse_config(struct net_device *dev)
                set_fs(fs);                     /* Return to the original context */
 #endif /* BIN_DL */
 
-       DBG_LEAVE(DbgInfo);
        return;
 } /* parse_config */
 
@@ -354,8 +344,6 @@ void translate_option(char *buffer, struct wl_private *lp)
        u_char mac_value[ETH_ALEN];
        /*------------------------------------------------------------------------*/
 
-       DBG_FUNC("translate_option");
-
        if (buffer == NULL || lp == NULL) {
                DBG_ERROR(DbgInfo, "Config file buffer and/or wavelan buffer ptr NULL\n");
                return;
@@ -959,10 +947,6 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal)
 {
        int i;
        int size;
-       /*------------------------------------------------------------------------*/
-
-       DBG_FUNC("ParseConfigLine");
-       DBG_ENTER(DbgInfo);
 
        /* get a snapshot of our string size */
        size      = strlen(pszLine);
@@ -1005,7 +989,6 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal)
                                pszLine[i] = '\0';
                }
        }
-       DBG_LEAVE(DbgInfo);
 } /* ParseConfigLine */
 /*============================================================================*/