Staging: vt6655: remove unused argument in ChannelValid function

Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index de5f2ba2cf46f8de4eee32275668659ec4a2769a..f239920d7f237bf48a75309f53d49ca80378e6ba 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -440,8 +440,7 @@ s_vCaculateOFDMRParameter(
 /*---------------------  Export function  -------------------------*/
 /************************************************************************
  * Country Channel Valid
- *  Input:  CountryCode, ChannelNum
- *          ChanneIndex is defined as VT3253 MAC channel:
+ *  Input:  ChannelIndex is defined as VT3253 MAC channel:
  *              1   = 2.4G channel 1
  *              2   = 2.4G channel 2
  *              ...
@@ -458,7 +457,7 @@ s_vCaculateOFDMRParameter(
  ************************************************************************/
 //2008-8-4 <add> by chester
 BOOL
-ChannelValid(UINT CountryCode, UINT ChannelIndex)
+ChannelValid(UINT ChannelIndex)
 {
     BOOL    bValid;
 

diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 76313462cf761e3c39f175b1b21ad8c25954188d..d2207bfbe11f8579d62ca21d63bc7e0f25076fb2 100644 (file)
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -86,7 +86,7 @@ typedef enum _CARD_OP_MODE {
 
 /*---------------------  Export Functions  --------------------------*/
 
-BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex);
+BOOL ChannelValid(UINT ChannelIndex);
 void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType);
 void vUpdateIFS(void *pDeviceHandler);
 void CARDvUpdateBasicTopRate(void *pDeviceHandler);

diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 28665d870f597e1491e7b0b3e8532f4e5ac990ce..c2bf287961a9fe073f7357a41bd79185436b70aa 100644 (file)
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -408,7 +408,7 @@ vCommandTimer (
 
             } else {
 //2008-8-4 <add> by chester
-                 if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) {
+               if (!ChannelValid(pMgmt->uScanChannel)) {
                     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n",pMgmt->uScanChannel);
                     s_bCommandComplete(pDevice);
                     return;
@@ -441,7 +441,7 @@ vCommandTimer (
       //          printk("chester-ch=%d\n",pMgmt->uScanChannel);
        pMgmt->uScanChannel++;
 //2008-8-4 <modify> by chester
-        if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel) &&
+               if (!ChannelValid(pMgmt->uScanChannel) &&
                         pMgmt->uScanChannel <= pDevice->byMaxChannel ){
                     pMgmt->uScanChannel=pDevice->byMaxChannel+1;
                 pMgmt->eCommandState = WLAN_CMD_SCAN_END;