staging: wlags49: don't use custom implementation of atoi()

Kernel has its own method called simple_strtoul() to do such things.

Here we are using simple_strtoul(value, NULL, 0) because in original function
the recognized base is 10 or 16 and input data is assumed to be unsigned.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index 16764a0009428ed1499cab6d9eb52fb4eeac27f5..cf0c38468b201c98b326aca5449b0ca9a86d8927 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -3792,7 +3792,7 @@ static int write_int(struct file *file, const char *buffer, unsigned long count,
        }
        if  (count > 0 ) {
                proc_number[count] = 0;
-               nr = wl_atoi( proc_number );
+               nr = simple_strtoul(proc_number , NULL, 0);
                *(unsigned int *)data = nr;
                if ( nr & 0x8000 ) {    //;?kludgy but it is unclear to me were else to place this
 #if DBG

diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c
index 715f027a923f672b566237856b659d2e5ac47726..1e0c75f28557a03273b056ccec79558d7ae8059d 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_profile.c
+++ b/drivers/staging/wlags49_h2/wl_profile.c
@@ -383,15 +383,15 @@ void translate_option( char *buffer, struct wl_private *lp )
                                DbgInfo->DebugFlag |= DBG_DEFAULTS;
                        }
                } else {
-                       DbgInfo->DebugFlag = wl_atoi( value ); //;?DebugFlag;
+                       DbgInfo->DebugFlag = simple_strtoul(value, NULL, 0); //;?DebugFlag;
                }
-               DbgInfo->DebugFlag = wl_atoi( value ); //;?Delete ASAP
+               DbgInfo->DebugFlag = simple_strtoul(value, NULL, 0); //;?Delete ASAP
        }
 #endif /* DBG */
        if ( strcmp( key, PARM_NAME_AUTH_KEY_MGMT_SUITE ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_AUTH_KEY_MGMT_SUITE, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_AUTH_KEY_MGMT_SUITE ) || ( value_convert <= PARM_MAX_AUTH_KEY_MGMT_SUITE )) {
                        lp->AuthKeyMgmtSuite = value_convert;
                } else {
@@ -401,7 +401,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_BRSC_2GHZ ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_BRSC_2GHZ, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_BRSC ) || ( value_convert <= PARM_MAX_BRSC )) {
                        lp->brsc[0] = value_convert;
                } else {
@@ -411,7 +411,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_BRSC_5GHZ ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_BRSC_5GHZ, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_BRSC ) || ( value_convert <= PARM_MAX_BRSC )) {
                        lp->brsc[1] = value_convert;
                } else {
@@ -448,7 +448,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_ENABLE_ENCRYPTION ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_ENABLE_ENCRYPTION, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_ENABLE_ENCRYPTION ) && ( value_convert <= PARM_MAX_ENABLE_ENCRYPTION )) {
                        lp->EnableEncryption = value_convert;
                } else {
@@ -529,7 +529,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_MULTICAST_RATE ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_MULTICAST_RATE, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
 
                if (( value_convert >= PARM_MIN_MULTICAST_RATE ) && ( value_convert <= PARM_MAX_MULTICAST_RATE )) {
                        lp->MulticastRate[0] = value_convert;
@@ -540,7 +540,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_OWN_CHANNEL ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_CHANNEL, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if ( wl_is_a_valid_chan( value_convert )) {
                        if ( value_convert > 14 ) {
                                value_convert = value_convert | 0x100;
@@ -567,7 +567,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                        lp->RTSThreshold = value_convert;
                } else {
@@ -577,7 +577,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_SRSC_2GHZ ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_SRSC_2GHZ, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_SRSC ) || ( value_convert <= PARM_MAX_SRSC )) {
                        lp->srsc[0] = value_convert;
                } else {
@@ -587,7 +587,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_SRSC_5GHZ ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_SRSC_5GHZ, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_SRSC ) || ( value_convert <= PARM_MAX_SRSC )) {
                        lp->srsc[1] = value_convert;
                } else {
@@ -597,7 +597,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_SYSTEM_SCALE ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_SYSTEM_SCALE, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_SYSTEM_SCALE ) && ( value_convert <= PARM_MAX_SYSTEM_SCALE )) {
                        lp->DistanceBetweenAPs = value_convert;
                } else {
@@ -607,9 +607,9 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_TX_KEY ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_KEY, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_TX_KEY ) && ( value_convert <= PARM_MAX_TX_KEY )) {
-                       lp->TransmitKeyID = wl_atoi( value );
+                       lp->TransmitKeyID = simple_strtoul(value, NULL, 0);
                } else {
                        DBG_WARNING( DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_KEY );
                }
@@ -617,7 +617,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_TX_RATE ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                        lp->TxRateControl[0] = value_convert;
                } else {
@@ -627,7 +627,7 @@ void translate_option( char *buffer, struct wl_private *lp )
        else if ( strcmp( key, PARM_NAME_TX_POW_LEVEL ) == 0 ) {
                DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_POW_LEVEL, value );
 
-               value_convert = wl_atoi( value );
+               value_convert = simple_strtoul(value, NULL, 0);
                if (( value_convert >= PARM_MIN_TX_POW_LEVEL ) || ( value_convert <= PARM_MAX_TX_POW_LEVEL )) {
                        lp->txPowLevel = value_convert;
                } else {
@@ -645,7 +645,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                if ( strcmp( key, PARM_NAME_PORT_TYPE ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_PORT_TYPE, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert == PARM_MIN_PORT_TYPE ) || ( value_convert == PARM_MAX_PORT_TYPE )) {
                                lp->PortType = value_convert;
                        } else {
@@ -654,7 +654,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                }
                else if ( strcmp( key, PARM_NAME_PM_ENABLED ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_PM_ENABLED, value );
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
        /* ;? how about wl_main.c containing
         * VALID_PARAM( PARM_PM_ENABLED <= WVLAN_PM_STATE_STANDARD ||
         *                                       ( PARM_PM_ENABLED & 0x7FFF ) <= WVLAN_PM_STATE_STANDARD );
@@ -677,7 +677,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_MAX_SLEEP ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_MAX_SLEEP, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= 0 ) && ( value_convert <= 65535 )) {
                                lp->MaxSleepDuration = value_convert;
                        } else {
@@ -696,7 +696,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_AUTHENTICATION ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_AUTHENTICATION, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_AUTHENTICATION ) && ( value_convert <= PARM_MAX_AUTHENTICATION )) {
                                lp->authentication = value_convert;
                        } else {
@@ -706,7 +706,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_OWN_ATIM_WINDOW ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_ATIM_WINDOW, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_OWN_ATIM_WINDOW ) && ( value_convert <= PARM_MAX_OWN_ATIM_WINDOW )) {
                                lp->atimWindow = value_convert;
                        } else {
@@ -716,7 +716,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_PM_HOLDOVER_DURATION ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_PM_HOLDOVER_DURATION, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_PM_HOLDOVER_DURATION ) && ( value_convert <= PARM_MAX_PM_HOLDOVER_DURATION )) {
                                lp->holdoverDuration = value_convert;
                        } else {
@@ -730,7 +730,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_CONNECTION_CONTROL ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_CONNECTION_CONTROL, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_CONNECTION_CONTROL ) && ( value_convert <= PARM_MAX_CONNECTION_CONTROL )) {
                                lp->connectionControl = value_convert;
                        } else {
@@ -749,7 +749,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                if ( strcmp( key, PARM_NAME_OWN_DTIM_PERIOD ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_DTIM_PERIOD, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if ( value_convert >= PARM_MIN_OWN_DTIM_PERIOD ) {
                                lp->DTIMPeriod = value_convert;
                        } else {
@@ -775,7 +775,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_OWN_BEACON_INTERVAL ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_BEACON_INTERVAL, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if ( value_convert >= PARM_MIN_OWN_BEACON_INTERVAL ) {
                                lp->ownBeaconInterval = value_convert;
                        } else {
@@ -785,7 +785,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_COEXISTENCE ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_COEXISTENCE, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if ( value_convert >= PARM_MIN_COEXISTENCE ) {
                                lp->coexistence = value_convert;
                        } else {
@@ -797,7 +797,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD1 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD1, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                                lp->wds_port[0].rtsThreshold = value_convert;
                        } else {
@@ -807,7 +807,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD2 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD2, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                                lp->wds_port[1].rtsThreshold = value_convert;
                        } else {
@@ -817,7 +817,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD3 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD3, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                                lp->wds_port[2].rtsThreshold = value_convert;
                        } else {
@@ -827,7 +827,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD4 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD4, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                                lp->wds_port[3].rtsThreshold = value_convert;
                        } else {
@@ -837,7 +837,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD5 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD5, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                                lp->wds_port[4].rtsThreshold = value_convert;
                        } else {
@@ -847,7 +847,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_RTS_THRESHOLD6 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD6, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_RTS_THRESHOLD ) && ( value_convert <= PARM_MAX_RTS_THRESHOLD )) {
                                lp->wds_port[5].rtsThreshold = value_convert;
                        } else {
@@ -857,7 +857,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_TX_RATE1 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE1, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                                lp->wds_port[0].txRateCntl = value_convert;
                        } else {
@@ -867,7 +867,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_TX_RATE2 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE2, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                                lp->wds_port[1].txRateCntl = value_convert;
                        } else {
@@ -877,7 +877,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_TX_RATE3 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE3, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                                lp->wds_port[2].txRateCntl = value_convert;
                        } else {
@@ -887,7 +887,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_TX_RATE4 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE4, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                                lp->wds_port[3].txRateCntl = value_convert;
                        } else {
@@ -897,7 +897,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_TX_RATE5 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE5, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                                lp->wds_port[4].txRateCntl = value_convert;
                        } else {
@@ -907,7 +907,7 @@ void translate_option( char *buffer, struct wl_private *lp )
                else if ( strcmp( key, PARM_NAME_TX_RATE6 ) == 0 ) {
                        DBG_TRACE( DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE6, value );
 
-                       value_convert = wl_atoi( value );
+                       value_convert = simple_strtoul(value, NULL, 0);
                        if (( value_convert >= PARM_MIN_TX_RATE ) && ( value_convert <= PARM_MAX_TX_RATE )) {
                                lp->wds_port[5].txRateCntl = value_convert;
                        } else {

diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c
index ac1e7f38f98274e67131fa6ec0c23cb07eadc649..bbdb9973d1e571fe41fe6039b1d2ec14b3af925c 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_util.c
+++ b/drivers/staging/wlags49_h2/wl_util.c
@@ -1536,52 +1536,3 @@ int wl_get_tallies(struct wl_private *lp,
     return ret;
 }
 
-/*******************************************************************************
- *     wl_atoi()
- *******************************************************************************
- *
- *  DESCRIPTION:
- *
- *      Believe it or not, we need our own implementation of atoi in the kernel.
- *
- *  PARAMETERS:
- *
- *      string  - the ASCII string to convert to an integer
- *
- *  RETURNS:
- *
- *      unsigned integer
- *
- ******************************************************************************/
-unsigned int wl_atoi( char *string )
-{
-unsigned int base = 10;                                //default to decimal
-unsigned int value = 0;
-unsigned int c;
-int i = strlen( string );
-
-       if ( i > 2 && string[0] == '0' && ( string[1] | ('X'^'x') ) == 'x' ) {
-               base = 16;
-               string +=2;
-       }
-       while ( ( c = *string++ ) != '\0' ) {
-               if ( value > UINT_MAX / base ) {        //test for overrun
-                       DBG_FUNC( "wl_atoi" );  //don't overload the log file with good messages
-                       DBG_ENTER( DbgInfo );
-                       DBG_ERROR( DbgInfo, "string \"%s\", lenght exceeds expectations\n", string );
-                       printk( "<1>string \"%s\", lenght exceeds expectations\n", string );
-                       DBG_LEAVE( DbgInfo );
-                       break;
-               }
-               c -= '0';
-               if ( 0 <= c && c <= 9 ) value = base * value + c;
-               else if ( base == 16 ) {
-                       c += '0';
-                       c |= 'A'^'a';
-                       c = c - 'a'+ 10;
-                       if ( 10 <= c && c <= 15 ) value = base * value + c;
-               }
-       }
-       return value;
-} // wl_atoi
-

diff --git a/drivers/staging/wlags49_h2/wl_util.h b/drivers/staging/wlags49_h2/wl_util.h
index 16cd6c578adb421402314675e3007f41e08504b5..561e85b5c9b231094f03067d88070fcdf26a3690 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_util.h
+++ b/drivers/staging/wlags49_h2/wl_util.h
@@ -100,6 +100,4 @@ void wl_process_updated_record( struct wl_private *lp );
 void wl_process_assoc_status( struct wl_private *lp );
 void wl_process_security_status( struct wl_private *lp );
 
-unsigned int wl_atoi( char *string );
-
 #endif  // __WL_UTIL_H__