Commit 44c68c23 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman

Staging: rt28x0: remove optional loading of EEPROM from file in eFuse mode

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 782f1111
......@@ -1194,16 +1194,6 @@ NDIS_STATUS RTMPSetProfileParameters(
retval = RT_CfgSetCountryRegion(pAd, tmpbuf, BAND_5G);
DBGPRINT(RT_DEBUG_TRACE, ("CountryRegionABand=%d\n", pAd->CommonCfg.CountryRegionForABand));
}
#ifdef RTMP_EFUSE_SUPPORT
#ifdef RT30xx
//EfuseBufferMode
if(RTMPGetKeyParameter("EfuseBufferMode", tmpbuf, 25, pBuffer, TRUE))
{
pAd->bEEPROMFile = (UCHAR) simple_strtol(tmpbuf, 0, 10);
DBGPRINT(RT_DEBUG_TRACE, ("EfuseBufferMode=%d\n", pAd->bUseEfuse));
}
#endif // RT30xx //
#endif // RTMP_EFUSE_SUPPORT //
//CountryCode
if(RTMPGetKeyParameter("CountryCode", tmpbuf, 25, pBuffer, TRUE))
{
......
This diff is collapsed.
......@@ -69,10 +69,7 @@ INT RtmpChipOpsEepromHook(
return 0 ;
}
else
{
pAd->bFroceEEPROMBuffer = FALSE;
DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));
}
#endif // RTMP_EFUSE_SUPPORT //
#endif // RT30xx //
......
......@@ -694,15 +694,6 @@ VOID NICReadEEPROMParameters(
if (pAd->chipOps.eeinit)
pAd->chipOps.eeinit(pAd);
#ifdef RTMP_EFUSE_SUPPORT
#ifdef RT30xx
if(!pAd->bFroceEEPROMBuffer && pAd->bEEPROMFile)
{
DBGPRINT(RT_DEBUG_TRACE, ("--> NICReadEEPROMParameters::(Efuse)Load to EEPROM Buffer Mode\n"));
eFuseLoadEEPROM(pAd);
}
#endif // RT30xx //
#endif // RTMP_EFUSE_SUPPORT //
// Init EEPROM Address Number, before access EEPROM; if 93c46, EEPROMAddressNum=6, else if 93c66, EEPROMAddressNum=8
RTMP_IO_READ32(pAd, E2PROM_CSR, &data);
......
......@@ -1065,26 +1065,6 @@ int RtmpOSFileWrite(RTMP_OS_FD osfd, char *pDataPtr, int writeLen)
return osfd->f_op->write(osfd, pDataPtr, (size_t)writeLen, &osfd->f_pos);
}
void RtmpOSFSInfoChange(RTMP_OS_FS_INFO *pOSFSInfo, BOOLEAN bSet)
{
if (bSet)
{
// Save uid and gid used for filesystem access.
// Set user and group to 0 (root)
pOSFSInfo->fsuid = current_fsuid();
pOSFSInfo->fsgid = current_fsgid();
pOSFSInfo->fs = get_fs();
set_fs(KERNEL_DS);
}
else
{
set_fs(pOSFSInfo->fs);
}
}
/*******************************************************************************
Task create/management/kill related functions.
......
......@@ -2258,8 +2258,6 @@ struct _RTMP_ADAPTER
#ifdef RT30xx
#ifdef RTMP_EFUSE_SUPPORT
BOOLEAN bUseEfuse;
BOOLEAN bEEPROMFile;
BOOLEAN bFroceEEPROMBuffer;
UCHAR EEPROMImage[1024];
#endif // RTMP_EFUSE_SUPPORT //
#endif // RT30xx //
......@@ -4021,10 +4019,6 @@ INT set_eFusedump_Proc(
IN PRTMP_ADAPTER pAd,
IN PSTRING arg);
INT set_eFuseLoadFromBin_Proc(
IN PRTMP_ADAPTER pAd,
IN PSTRING arg);
VOID eFusePhysicalReadRegisters(
IN PRTMP_ADAPTER pAd,
IN USHORT Offset,
......@@ -4034,16 +4028,6 @@ VOID eFusePhysicalReadRegisters(
int RtmpEfuseSupportCheck(
IN RTMP_ADAPTER *pAd);
INT set_eFuseBufferModeWriteBack_Proc(
IN PRTMP_ADAPTER pAd,
IN PSTRING arg);
INT eFuseLoadEEPROM(
IN PRTMP_ADAPTER pAd);
INT eFuseWriteEeeppromBuf(
IN PRTMP_ADAPTER pAd);
VOID eFuseGetFreeBlockCount(IN PRTMP_ADAPTER pAd,
PUINT EfuseFreeBlock);
......@@ -5632,10 +5616,5 @@ int RtmpOSFileWrite(
IN char *pDataPtr,
IN int writeLen);
void RtmpOSFSInfoChange(
IN RTMP_OS_FS_INFO *pOSFSInfo,
IN BOOLEAN bSet);
#endif // __RTMP_H__
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment