staging: brcm80211: remove custom string library again

There was a clean up commit for softmac driver. Do the same for fullmac
implementation.

Here:
 - strtoul and bcm_strtoul are changed to simple_strtoul
 - bcmstrtok -> strsep

All unused functions are deleted.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 54b07f936fffc263caf8cb87313d94b1fd75bfd4..481c35d98b384a9c1436f7c6f989b0484329ab14 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -15,6 +15,8 @@
  */
 #include <typedefs.h>
 #include <osl.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
 #include <dngl_stats.h>
@@ -967,8 +969,6 @@ void print_buf(void *pbuf, int len, int bytes_per_line)
        printf("\n");
 }
 
-#define strtoul(nptr, endptr, base) simple_strtoul((nptr), (endptr), (base))
-
 /* Convert user's input in hex pattern to byte-size mask */
 static int wl_pattern_atoh(char *src, char *dst)
 {
@@ -986,7 +986,7 @@ static int wl_pattern_atoh(char *src, char *dst)
                char num[3];
                strncpy(num, src, 2);
                num[2] = '\0';
-               dst[i] = (u8) strtoul(num, NULL, 16);
+               dst[i] = (u8) simple_strtoul(num, NULL, 16);
                src += 2;
        }
        return i;
@@ -1015,7 +1015,7 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable,
        arg_org = arg_save;
        memcpy(arg_save, arg, strlen(arg) + 1);
 
-       argv[i] = bcmstrtok(&arg_save, " ", 0);
+       argv[i] = strsep(&arg_save, " ");
 
        i = 0;
        if (NULL == argv[i]) {
@@ -1032,7 +1032,7 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable,
        pkt_filterp = (wl_pkt_filter_enable_t *) (buf + str_len + 1);
 
        /* Parse packet filter id. */
-       enable_parm.id = htod32(strtoul(argv[i], NULL, 0));
+       enable_parm.id = htod32(simple_strtoul(argv[i], NULL, 0));
 
        /* Parse enable/disable value. */
        enable_parm.enable = htod32(enable);
@@ -1101,9 +1101,9 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
                goto fail;
        }
 
-       argv[i] = bcmstrtok(&arg_save, " ", 0);
+       argv[i] = strsep(&arg_save, " ");
        while (argv[i++])
-               argv[i] = bcmstrtok(&arg_save, " ", 0);
+               argv[i] = strsep(&arg_save, " ");
 
        i = 0;
        if (NULL == argv[i]) {
@@ -1120,7 +1120,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
        pkt_filterp = (wl_pkt_filter_t *) (buf + str_len + 1);
 
        /* Parse packet filter id. */
-       pkt_filter.id = htod32(strtoul(argv[i], NULL, 0));
+       pkt_filter.id = htod32(simple_strtoul(argv[i], NULL, 0));
 
        if (NULL == argv[++i]) {
                DHD_ERROR(("Polarity not provided\n"));
@@ -1128,7 +1128,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
        }
 
        /* Parse filter polarity. */
-       pkt_filter.negate_match = htod32(strtoul(argv[i], NULL, 0));
+       pkt_filter.negate_match = htod32(simple_strtoul(argv[i], NULL, 0));
 
        if (NULL == argv[++i]) {
                DHD_ERROR(("Filter type not provided\n"));
@@ -1136,7 +1136,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
        }
 
        /* Parse filter type. */
-       pkt_filter.type = htod32(strtoul(argv[i], NULL, 0));
+       pkt_filter.type = htod32(simple_strtoul(argv[i], NULL, 0));
 
        if (NULL == argv[++i]) {
                DHD_ERROR(("Offset not provided\n"));
@@ -1144,7 +1144,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
        }
 
        /* Parse pattern filter offset. */
-       pkt_filter.u.pattern.offset = htod32(strtoul(argv[i], NULL, 0));
+       pkt_filter.u.pattern.offset = htod32(simple_strtoul(argv[i], NULL, 0));
 
        if (NULL == argv[++i]) {
                DHD_ERROR(("Bitmask not provided\n"));
@@ -1290,7 +1290,7 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd)
        ptr = buf;
        bcm_mkiovar("ver", 0, 0, buf, sizeof(buf));
        dhdcdc_query_ioctl(dhd, 0, WLC_GET_VAR, buf, sizeof(buf));
-       bcmstrtok(&ptr, "\n", 0);
+       strsep(&ptr, "\n");
        /* Print fw version info */
        DHD_ERROR(("Firmware version = %s\n", buf));
 

diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index c073e446a8007d62edc63ceecdba3d4dc31ca584..e9920e5a93a6737c23c2f77bf0737d99a380d4bd 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -17,6 +17,7 @@
 #include <typedefs.h>
 #include <linuxver.h>
 #include <osl.h>
+#include <linux/kernel.h>
 
 #include <bcmutils.h>
 #include <bcmendian.h>
@@ -3588,7 +3589,6 @@ dongle_offload_out:
 
 static s32 wl_pattern_atoh(s8 *src, s8 *dst)
 {
-#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
        int i;
        if (strncmp(src, "0x", 2) != 0 && strncmp(src, "0X", 2) != 0) {
                WL_ERR(("Mask invalid format. Needs to start with 0x\n"));
@@ -3603,7 +3603,7 @@ static s32 wl_pattern_atoh(s8 *src, s8 *dst)
                char num[3];
                strncpy(num, src, 2);
                num[2] = '\0';
-               dst[i] = (u8) strtoul(num, NULL, 16);
+               dst[i] = (u8) simple_strtoul(num, NULL, 16);
                src += 2;
        }
        return i;

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index dcb02367d5d6996194cb47025d42dbe1ef26599b..504ff65d93ff67f87bf89280aed3888c7872baea 100644 (file)
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/drivers/staging/brcm80211/include/bcmutils.h
@@ -162,7 +162,6 @@
 #define        PKTPRIO_UPD     0x400   /* DSCP used to update VLAN prio */
 #define        PKTPRIO_DSCP    0x800   /* DSCP prio found */
 
-       char *bcmstrtok(char **string, const char *delimiters, char *tokdelim);
 /* ethernet address */
        extern char *bcm_ether_ntoa(const struct ether_addr *ea, char *buf);
        extern int bcm_ether_atoe(char *p, struct ether_addr *ea);

diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 71b23b6508253e27e270c9a1b928e6a7f5619943..02d76d67b9bb1b68d987973efa155f955c639f37 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -1117,79 +1117,3 @@ int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...)
        return r;
 }
 
-/****************************************************************************
-* Function:   bcmstrtok
-*
-* Purpose:
-*  Tokenizes a string. This function is conceptually similiar to ANSI C strtok(),
-*  but allows strToken() to be used by different strings or callers at the same
-*  time. Each call modifies '*string' by substituting a NULL character for the
-*  first delimiter that is encountered, and updates 'string' to point to the char
-*  after the delimiter. Leading delimiters are skipped.
-*
-* Parameters:
-*  string      (mod) Ptr to string ptr, updated by token.
-*  delimiters  (in)  Set of delimiter characters.
-*  tokdelim    (out) Character that delimits the returned token. (May
-*                    be set to NULL if token delimiter is not required).
-*
-* Returns:  Pointer to the next token found. NULL when no more tokens are found.
-*****************************************************************************
-*/
-char *bcmstrtok(char **string, const char *delimiters, char *tokdelim)
-{
-       unsigned char *str;
-       unsigned long map[8];
-       int count;
-       char *nextoken;
-
-       if (tokdelim != NULL) {
-               /* Prime the token delimiter */
-               *tokdelim = '\0';
-       }
-
-       /* Clear control map */
-       for (count = 0; count < 8; count++) {
-               map[count] = 0;
-       }
-
-       /* Set bits in delimiter table */
-       do {
-               map[*delimiters >> 5] |= (1 << (*delimiters & 31));
-       } while (*delimiters++);
-
-       str = (unsigned char *)*string;
-
-       /* Find beginning of token (skip over leading delimiters). Note that
-        * there is no token iff this loop sets str to point to the terminal
-        * null (*str == '\0')
-        */
-       while (((map[*str >> 5] & (1 << (*str & 31))) && *str) || (*str == ' ')) {
-               str++;
-       }
-
-       nextoken = (char *)str;
-
-       /* Find the end of the token. If it is not the end of the string,
-        * put a null there.
-        */
-       for (; *str; str++) {
-               if (map[*str >> 5] & (1 << (*str & 31))) {
-                       if (tokdelim != NULL) {
-                               *tokdelim = *str;
-                       }
-
-                       *str++ = '\0';
-                       break;
-               }
-       }
-
-       *string = (char *)str;
-
-       /* Determine if a token has been found. */
-       if (nextoken == (char *)str) {
-               return NULL;
-       } else {
-               return nextoken;
-       }
-}