]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - drivers/staging/bcm/nvm.c
beceem: remove dead code
[mv-sheeva.git] / drivers / staging / bcm / nvm.c
index 95716f596e6caa2afccb32bd4ecd9f7ae8142963..4f1b35a68b7f5a3cef2e3271a3d0507ffbbefc6a 100644 (file)
@@ -228,174 +228,12 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
                ReadBeceemEEPROMBulk(Adapter, uiTempOffset + MAX_RW_SIZE, (PUINT)&uiData[4], 4);
        }
 
-       OsalMemMove( (PUCHAR) pBuffer, ( ((PUCHAR)&uiData[0]) + uiByteOffset ), 4);
+       memcpy( (PUCHAR) pBuffer, ( ((PUCHAR)&uiData[0]) + uiByteOffset ), 4);
 
        return STATUS_SUCCESS;
 } /* ReadBeceemEEPROM() */
 
 
-#if 0
-//-----------------------------------------------------------------------------
-// Procedure:  IsEEPROMWriteDone
-//
-// Description: Reads the SPI status to see the status of previous write.
-//
-// Arguments:
-//             Adapter    - ptr to Adapter object instance
-//
-// Returns:
-//             BOOLEAN - TRUE  - write went through
-//              - FALSE - Write Failed.
-//-----------------------------------------------------------------------------
-
-BOOLEAN IsEEPROMWriteDone(PMINI_ADAPTER Adapter)
-{
-       UINT uiRetries = 16;
-       //UINT uiStatus  = 0;
-       UINT value;
-
-       //sleep for 1.2ms ..worst case EEPROM write can take up to 1.2ms.
-       mdelay(2);
-
-       value = 0;
-       rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-
-       while(((value >> 14) & 1) == 1)
-       {
-               // EEPROM_SPI_Q_STATUS1_REG will be cleared only if write back to that.
-               value = (0x1 << 14);
-               wrmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value));
-               udelay(1000);
-               uiRetries--;
-               if(uiRetries == 0)
-               {
-                       return FALSE;
-               }
-               value = 0;
-               rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-       }
-       return TRUE;
-
-
-}
-
-
-//-----------------------------------------------------------------------------
-// Procedure:  ReadBeceemEEPROMBulk
-//
-// Description: This routine reads 16Byte data from EEPROM
-//
-// Arguments:
-//             Adapter     - ptr to Adapter object instance
-//          dwAddress - EEPROM Offset to read the data from.
-//          pdwData    - Pointer to double word where data needs to be stored in.
-//
-// Returns:
-//             OSAL_STATUS_CODE:
-//-----------------------------------------------------------------------------
-
-INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
-{
-       DWORD dwRetries = 16;
-       DWORD dwIndex = 0;
-       UINT value, tmpVal;
-
-
-       value = 0;
-       rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
-
-       //read 0x0f003020 untill  bit 1 of 0x0f003008 is set.
-       while(((value >> 1) & 1) == 0)
-       {
-
-               rdmalt (Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
-               dwRetries--;
-               if(dwRetries == 0)
-               {
-                       return -1;
-               }
-               value = 0;
-               rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
-       }
-
-       value = dwAddress | 0xfb000000;
-       wrmalt (Adapter, 0x0f003018, &value, sizeof(value));
-
-       udelay(1000);
-       value = 0;
-       for(dwIndex = 0;dwIndex < 4 ; dwIndex++)
-       {
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] = value;
-
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] |= (value << 8);
-
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] |= (value << 16);
-
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] |= (value << 24);
-
-       }
-       return 0;
-}
-
-//-----------------------------------------------------------------------------
-// Procedure:  ReadBeceemEEPROM
-//
-// Description: This routine reads 4Byte data from EEPROM
-//
-// Arguments:
-//             Adapter     - ptr to Adapter object instance
-//          dwAddress - EEPROM Offset to read the data from.
-//          pdwData    - Pointer to double word where data needs to be stored in.
-//
-// Returns:
-//             OSAL_STATUS_CODE:
-//-----------------------------------------------------------------------------
-
-INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
-{
-
-       DWORD dwReadValue = 0;
-       DWORD dwRetries = 16, dwCompleteWord = 0;
-       UINT    value, tmpVal;
-
-       rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
-       while (((value >> 1) & 1) == 0) {
-               rdmalt(Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
-
-               if (dwRetries == 0) {
-                       return -1;
-               }
-               rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
-       }
-
-
-       //wrm (0x0f003018, 0xNbXXXXXX)      // N is the number of bytes u want to read  (0 means 1, f means 16,   b is the opcode for page read)
-       //     Follow it up by N executions of  rdm(0x0f003020) to read the rxed bytes from rx queue.
-       dwAddress |= 0x3b000000;
-       wrmalt(Adapter, 0x0f003018,&dwAddress,4);
-       mdelay(10);
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord=dwReadValue;
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord|=(dwReadValue<<8);
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord|=(dwReadValue<<16);
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord|=(dwReadValue<<24);
-
-       *pdwData = dwCompleteWord;
-
-       return 0;
-}
-#endif
 
 INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
 {
@@ -476,7 +314,7 @@ INT BeceemEEPROMBulkRead(
                ReadBeceemEEPROMBulk(Adapter,uiTempOffset,(PUINT)&uiData[0],4);
                if(uiBytesRemaining >= (MAX_RW_SIZE - uiExtraBytes))
                {
-                       OsalMemMove(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),MAX_RW_SIZE - uiExtraBytes);
+                       memcpy(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),MAX_RW_SIZE - uiExtraBytes);
 
                        uiBytesRemaining -= (MAX_RW_SIZE - uiExtraBytes);
                        uiIndex += (MAX_RW_SIZE - uiExtraBytes);
@@ -484,7 +322,7 @@ INT BeceemEEPROMBulkRead(
                }
                else
                {
-                       OsalMemMove(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),uiBytesRemaining);
+                       memcpy(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),uiBytesRemaining);
                        uiIndex += uiBytesRemaining;
                        uiOffset += uiBytesRemaining;
                        uiBytesRemaining = 0;
@@ -508,7 +346,7 @@ INT BeceemEEPROMBulkRead(
                         * We read 4 Dwords of data */
                        if(0 == ReadBeceemEEPROMBulk(Adapter,uiOffset,&uiData[0],4))
                        {
-                               OsalMemMove(pcBuff+uiIndex,&uiData[0],MAX_RW_SIZE);
+                               memcpy(pcBuff+uiIndex,&uiData[0],MAX_RW_SIZE);
                                uiOffset += MAX_RW_SIZE;
                                uiBytesRemaining -= MAX_RW_SIZE;
                                uiIndex += MAX_RW_SIZE;
@@ -523,7 +361,7 @@ INT BeceemEEPROMBulkRead(
                {
                        if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0]))
                        {
-                               OsalMemMove(pcBuff+uiIndex,&uiData[0],4);
+                               memcpy(pcBuff+uiIndex,&uiData[0],4);
                                uiOffset += 4;
                                uiBytesRemaining -= 4;
                                uiIndex +=4;
@@ -540,7 +378,7 @@ INT BeceemEEPROMBulkRead(
                        pCharBuff += uiIndex;
                        if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0]))
                        {
-                               OsalMemMove(pCharBuff,&uiData[0],uiBytesRemaining);//copy only bytes requested.
+                               memcpy(pCharBuff,&uiData[0],uiBytesRemaining);//copy only bytes requested.
                                uiBytesRemaining = 0;
                        }
                        else
@@ -655,14 +493,6 @@ INT BeceemFlashBulkRead(
 
 UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
 {
-#if 0
-       if(Adapter->bDDRInitDone)
-       {
-               return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT|FLASH_SIZE_ADDR);
-       }
-
-       return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT|FLASH_SIZE_ADDR);
-#endif
        if(IsFlash2x(Adapter))
                return  (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
        else
@@ -733,60 +563,6 @@ UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
        return 0;
 }
 
-#if 0
-/***********************************************************************************/
-//
-//  WriteBeceemEEPROM: Writes 4 byte data to EEPROM offset.
-//
-//                     uiEEPROMOffset - Offset to be written to.
-//                     uiData         - Data to be written.
-//
-/***********************************************************************************/
-
-INT WriteBeceemEEPROM(PMINI_ADAPTER Adapter,UINT uiEEPROMOffset, UINT uiData)
-{
-       INT Status = 0;
-       ULONG ulRdBk = 0;
-       ULONG ulRetryCount = 3;
-       UINT value;
-
-       if(uiEEPROMOffset > EEPROM_END)
-       {
-
-               return -1;
-       }
-
-       uiData = htonl(uiData);
-       while(ulRetryCount--)
-       {
-               value = 0x06000000;
-               wrmalt(Adapter, 0x0F003018,&value, sizeof(value));//flush the EEPROM FIFO.
-               wrmalt(Adapter, 0x0F00301C,&uiData, sizeof(uiData));
-               value = 0x3A000000 | uiEEPROMOffset;
-               wrmalt(Adapter, 0x0F003018,&value, sizeof(value));
-               __udelay(100000);
-               //read back and verify.
-               Status = ReadBeceemEEPROM(Adapter,uiEEPROMOffset,(UINT *)&ulRdBk);
-               if(Status == 0)
-               {
-                       if(ulRdBk == uiData)
-                       {
-                               return Status;
-                       }
-                       else
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback does not match\n");
-                       }
-               }
-               else
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback failed\n");
-               }
-       }
-
-       return 0;
-}
-#endif
 
 //-----------------------------------------------------------------------------
 // Procedure:  FlashSectorErase
@@ -973,7 +749,7 @@ static INT flashWrite(
 // need not write 0xFFFFFFFF because write requires an erase and erase will
 // make whole sector 0xFFFFFFFF.
 //
-       if (!OsalMemCompare(pData, uiErasePattern, MAX_RW_SIZE))
+       if (!memcmp(pData, uiErasePattern, MAX_RW_SIZE))
        {
                return 0;
        }
@@ -1138,7 +914,7 @@ static INT flashWriteStatus(
 // need not write 0xFFFFFFFF because write requires an erase and erase will
 // make whole sector 0xFFFFFFFF.
 //
-       if (!OsalMemCompare(pData,uiErasePattern,MAX_RW_SIZE))
+       if (!memcmp(pData,uiErasePattern,MAX_RW_SIZE))
        {
                return 0;
        }
@@ -1353,15 +1129,6 @@ INT BeceemFlashBulkWrite(
        UINT uiTemp                             = 0;
        UINT index                                      = 0;
        UINT uiPartOffset                       = 0;
-       #if 0
-       struct timeval tv1 = {0};
-       struct timeval tv2 = {0};
-
-       struct timeval tr = {0};
-       struct timeval te = {0};
-       struct timeval tw = {0};
-       struct timeval twv = {0};
-       #endif
 
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
   Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
@@ -1377,12 +1144,9 @@ INT BeceemFlashBulkWrite(
        uiCurrSectOffsetAddr    = uiOffset & (Adapter->uiSectorSize - 1);
        uiSectBoundary                  = uiSectAlignAddr + Adapter->uiSectorSize;
 
-       //pTempBuff = OsalMemAlloc(MAX_SECTOR_SIZE,'!MVN');
-       pTempBuff = OsalMemAlloc(Adapter->uiSectorSize ,"!MVN");
+       pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
        if(NULL == pTempBuff)
-       {
                goto BeceemFlashBulkWrite_EXIT;
-       }
 //
 // check if the data to be written is overlapped accross sectors
 //
@@ -1399,7 +1163,6 @@ INT BeceemFlashBulkWrite(
                        uiNumSectTobeRead++;
                }
        }
-       #if 1
        //Check whether Requested sector is writable or not in case of flash2x write. But if  write call is
        // for DSD calibration, allow it without checking of sector permission
 
@@ -1420,7 +1183,6 @@ INT BeceemFlashBulkWrite(
                         index = index + 1 ;
                }
        }
-       #endif
        Adapter->SelectedChip = RESET_CHIP_SELECT;
        while(uiNumSectTobeRead)
        {
@@ -1448,13 +1210,13 @@ INT BeceemFlashBulkWrite(
                if(uiNumSectTobeRead > 1)
                {
 
-                       OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
+                       memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                        pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)));
                        uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                }
                else
                {
-                               OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
+                               memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
                }
 
                if(IsFlash2x(Adapter))
@@ -1503,7 +1265,7 @@ INT BeceemFlashBulkWrite(
                                }
                                else
                                {
-                                       if(OsalMemCompare(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
+                                       if(memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
                                        {
                                                if(STATUS_SUCCESS != (*Adapter->fpFlashWriteWithStatusCheck)(Adapter,uiPartOffset+uiIndex,&pTempBuff[uiIndex]))
                                                {
@@ -1541,10 +1303,8 @@ BeceemFlashBulkWrite_EXIT:
        {
                BcmRestoreBlockProtectStatus(Adapter,ulStatus);
        }
-       if(pTempBuff)
-       {
-               OsalMemFree(pTempBuff,Adapter->uiSectorSize);
-       }
+       
+       kfree(pTempBuff);
 
        Adapter->SelectedChip = RESET_CHIP_SELECT;
        return Status;
@@ -1599,14 +1359,10 @@ static INT BeceemFlashBulkWriteStatus(
        uiCurrSectOffsetAddr    = uiOffset & (Adapter->uiSectorSize - 1);
        uiSectBoundary                  = uiSectAlignAddr + Adapter->uiSectorSize;
 
-
-
-//     pTempBuff = OsalMemAlloc(MAX_SECTOR_SIZE,'!MVN');
-       pTempBuff = OsalMemAlloc(Adapter->uiSectorSize,"!MVN");
+       pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
        if(NULL == pTempBuff)
-       {
                goto BeceemFlashBulkWriteStatus_EXIT;
-       }
+
 //
 // check if the data to be written is overlapped accross sectors
 //
@@ -1662,13 +1418,13 @@ static INT BeceemFlashBulkWriteStatus(
                if(uiNumSectTobeRead > 1)
                {
 
-                       OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
+                       memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                        pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)));
                        uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                }
                else
                {
-                       OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
+                       memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
                }
 
                if(IsFlash2x(Adapter))
@@ -1698,25 +1454,10 @@ static INT BeceemFlashBulkWriteStatus(
                {
                        for(uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE)
                        {
-#if 0
-                               if(0 == BeceemFlashBulkRead(Adapter,uiReadBk,uiOffsetFromSectStart+uiIndex + Adapter->ulFlashCalStart ,MAX_RW_SIZE))
-                               {
-                                       for(uiReadIndex = 0;uiReadIndex < 4; uiReadIndex++)
-                                       {
-                                               if(*((PUINT)&pTempBuff[uiIndex+uiReadIndex*4]) != uiReadBk[uiReadIndex])
-                                               {
-                                                       Status = -1;
-                                                       goto BeceemFlashBulkWriteStatus_EXIT;
-
-                                               }
-                                       }
-
-                               }
-#endif
 
                                if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE))
                                {
-                                       if(OsalMemCompare(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
+                                       if(memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
                                        {
                                                Status = STATUS_FAILURE;
                                                goto BeceemFlashBulkWriteStatus_EXIT;
@@ -1747,10 +1488,8 @@ BeceemFlashBulkWriteStatus_EXIT:
        {
                BcmRestoreBlockProtectStatus(Adapter,ulStatus);
        }
-       if(pTempBuff)
-       {
-               OsalMemFree(pTempBuff,Adapter->uiSectorSize);
-       }
+
+       kfree(pTempBuff);
        Adapter->SelectedChip = RESET_CHIP_SELECT;
        return Status;
 
@@ -1771,7 +1510,7 @@ BeceemFlashBulkWriteStatus_EXIT:
 
 INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
 {
-       PCHAR pBuff = OsalMemAlloc(BUFFER_4K,"3MVN");
+       PCHAR pBuff = kmalloc(BUFFER_4K, GFP_KERNEL);
        UINT uiEepromSize = 0;
        UINT uiIndex = 0;
        UINT uiBytesToCopy = 0;
@@ -1787,14 +1526,14 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
        if(0 != BeceemEEPROMBulkRead(Adapter,&uiEepromSize,EEPROM_SIZE_OFFSET,4))
        {
 
-               OsalMemFree(pBuff,BUFFER_4K);
+               kfree(pBuff);
                return -1;
        }
 
        uiEepromSize >>= 16;
        if(uiEepromSize > 1024*1024)
        {
-               OsalMemFree(pBuff,BUFFER_4K);
+               kfree(pBuff);
                return -1;
        }
 
@@ -1820,7 +1559,7 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
        wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-4,&value, sizeof(value));
        value = 0xbeadbead;
        wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-8,&value, sizeof(value));
-       OsalMemFree(pBuff,MAX_RW_SIZE);
+       kfree(pBuff);
 
        return Status;
 
@@ -1873,7 +1612,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
                return -1;
        }
 
-       pBuff = OsalMemAlloc(uiEepromSize, 0);
+       pBuff = kmalloc(uiEepromSize, GFP_KERNEL);
 
        if ( pBuff == NULL )
        {
@@ -1882,7 +1621,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
 
        if(0 != BeceemNVMRead(Adapter,(PUINT)pBuff,uiCalStartAddr, uiEepromSize))
        {
-               OsalMemFree(pBuff, 0);
+               kfree(pBuff);
                return -1;
        }
 
@@ -1905,7 +1644,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
                uiBytesToCopy = MIN(BUFFER_4K,uiEepromSize);
        }
 
-       OsalMemFree(pBuff, 0);
+       kfree(pBuff);
        return Status;
 
 }
@@ -1947,14 +1686,14 @@ static INT BeceemEEPROMReadBackandVerify(
                {// for the requests more than or equal to MAX_RW_SIZE bytes, use bulk read function to make the access faster.
                        BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE);
 
-                       if(OsalMemCompare(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
+                       if(memcmp(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
                        {
                                // re-write
                                BeceemEEPROMBulkWrite(Adapter,(PUCHAR)(pBuffer+uiIndex),uiOffset,MAX_RW_SIZE,FALSE);
                                mdelay(3);
                                BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE);
 
-                               if(OsalMemCompare(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
+                               if(memcmp(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
                                {
                                        return -1;
                                }
@@ -1986,7 +1725,7 @@ static INT BeceemEEPROMReadBackandVerify(
                else
                { // Handle the reads less than 4 bytes...
                        uiData = 0;
-                       OsalMemMove(&uiData,((PUCHAR)pBuffer)+(uiIndex*sizeof(UINT)),uiNumBytes);
+                       memcpy(&uiData,((PUCHAR)pBuffer)+(uiIndex*sizeof(UINT)),uiNumBytes);
                        BeceemEEPROMBulkRead(Adapter,&uiRdbk,uiOffset,4);
 
                        if(memcmp(&uiData, &uiRdbk, uiNumBytes))
@@ -2186,7 +1925,7 @@ INT BeceemEEPROMBulkWrite(
 
                if(uiBytesToCopy >= (16 -uiExtraBytes))
                {
-                       OsalMemMove((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes);
+                       memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes);
 
                        if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
                                        return STATUS_FAILURE;
@@ -2197,7 +1936,7 @@ INT BeceemEEPROMBulkWrite(
                }
                else
                {
-                       OsalMemMove((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy);
+                       memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy);
 
                        if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
                                        return STATUS_FAILURE;
@@ -2233,7 +1972,7 @@ INT BeceemEEPROMBulkWrite(
        // To program non 16byte aligned data, read 16byte and then update.
        //
                        BeceemEEPROMBulkRead(Adapter,&uiData[0],uiOffset,16);
-                       OsalMemMove(&uiData[0],pBuffer+uiIndex,uiBytesToCopy);
+                       memcpy(&uiData[0],pBuffer+uiIndex,uiBytesToCopy);
 
 
                        if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiOffset ) )
@@ -2763,7 +2502,7 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
        if(psAdapter->psFlash2xCSInfo == NULL)
        {
                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate memory for Flash 2.x");
-               bcm_kfree(psAdapter->psFlashCSInfo);
+               kfree(psAdapter->psFlashCSInfo);
                return -ENOMEM;
        }
 
@@ -2771,8 +2510,8 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
        if(psAdapter->psFlash2xVendorInfo == NULL)
        {
                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate Vendor Info Memory for Flash 2.x");
-               bcm_kfree(psAdapter->psFlashCSInfo);
-               bcm_kfree(psAdapter->psFlash2xCSInfo);
+               kfree(psAdapter->psFlashCSInfo);
+               kfree(psAdapter->psFlash2xCSInfo);
                return -ENOMEM;
        }
 
@@ -2786,9 +2525,9 @@ INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0," Adapter structure point is NULL");
                return -EINVAL;
        }
-       bcm_kfree(psAdapter->psFlashCSInfo);
-       bcm_kfree(psAdapter->psFlash2xCSInfo);
-       bcm_kfree(psAdapter->psFlash2xVendorInfo);
+       kfree(psAdapter->psFlashCSInfo);
+       kfree(psAdapter->psFlash2xCSInfo);
+       kfree(psAdapter->psFlash2xVendorInfo);
        return STATUS_SUCCESS ;
 }
 
@@ -3169,15 +2908,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 
        Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion;
 
-       #if 0
-       if(FLASH_PART_SST25VF080B == Adapter->ulFlashID)
-       {
-       //
-       // 1MB flash has been selected. we have to use 64K as sector size no matter what is kept in FLASH_CS.
-       //
-               Adapter->uiSectorSize = 0x10000;
-       }
-       #endif
 
        return STATUS_SUCCESS ;
 }
@@ -4570,7 +4300,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 
        }
 
-       bcm_kfree(Buff);
+       kfree(Buff);
 
        return Status;
 }
@@ -4848,20 +4578,6 @@ INT      BcmCopySection(PMINI_ADAPTER Adapter,
                return  -EINVAL;
        }
 
-       #if 0
-       else
-       {
-               if((SrcSection == VSA0) || (SrcSection == VSA1) || (SrcSection == VSA2))
-               {
-                       if((DstSection != VSA0) && (DstSection != VSA1) && (DstSection != VSA2))
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Source and Destion secton is not of same type");
-                               return -EINVAL;
-                       }
-               }
-
-       }
-       #endif
        //if offset zero means have to copy complete secton
 
        if(numOfBytes == 0)
@@ -4936,7 +4652,7 @@ INT       BcmCopySection(PMINI_ADAPTER Adapter,
                                BytesToBeCopied = numOfBytes;
                }
        }while(numOfBytes > 0) ;
-       bcm_kfree(pBuff);
+       kfree(pBuff);
        Adapter->bHeaderChangeAllowed = FALSE ;
        return Status;
 }
@@ -4961,14 +4677,6 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
        UINT uiSectAlignAddr = 0;
        UINT sig = 0;
 
-       #if 0
-       //if Chenges in Header is allowed, Return back
-       if(Adapter->bHeaderChangeAllowed == TRUE)
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Header Change is allowed");
-               return STATUS_SUCCESS ;
-       }
-       #endif
        //making the offset sector alligned
        uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1);
 
@@ -5006,7 +4714,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
                //Replace Buffer content with Header
                memcpy(pBuff +offsetToProtect,pTempBuff,HeaderSizeToProtect);
 
-               bcm_kfree(pTempBuff);
+               kfree(pTempBuff);
        }
        if(bHasHeader && Adapter->bSigCorrupted)
        {
@@ -5347,39 +5055,6 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
        return Status;
 }
 
-#if 0
-UINT getNumOfSubSectionWithWRPermisson(PMINI_ADAPTER Adapter, SECTION_TYPE secType)
-{
-
-       UINT numOfWRSubSec = 0;
-       switch(secType)
-       {
-               case ISO :
-                       if(IsSectionWritable(Adapter,ISO_IMAGE1))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       if(IsSectionWritable(Adapter,ISO_IMAGE2))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       break;
-
-               case DSD :
-                       if(IsSectionWritable(Adapter,DSD2))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       if(IsSectionWritable(Adapter,DSD1))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       if(IsSectionWritable(Adapter,DSD0))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       break ;
-
-               case VSA :
-                               //for VSA Add code Here
-                default :
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Invalid secton<%d> is passed", secType);\
-                       numOfWRSubSec = 0;
-
-       }
-       return numOfWRSubSec;
-}
-#endif
 BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
 {
 
@@ -5525,11 +5200,11 @@ INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
        else
        {
                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header");
-               bcm_kfree(pBuff);
+               kfree(pBuff);
                return STATUS_FAILURE;
        }
 
-       bcm_kfree(pBuff);
+       kfree(pBuff);
        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
        return STATUS_SUCCESS ;
 }
@@ -5575,14 +5250,14 @@ INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
        else
        {
                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header");
-               bcm_kfree(pBuff);
+               kfree(pBuff);
                return STATUS_FAILURE;
        }
 
        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
        BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,pBuff,MAX_RW_SIZE);
 
-       bcm_kfree(pBuff);
+       kfree(pBuff);
        return STATUS_SUCCESS ;
 }