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

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

drivers/staging/rt2860/common/cmm_profile.c

+0 −10
Original line number Diff line number Diff line
@@ -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))

		{

drivers/staging/rt2860/common/ee_efuse.c

+1 −787

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rt2860/common/eeprom.c

+0 −3
Original line number Diff line number Diff line
@@ -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 //

drivers/staging/rt2860/common/rtmp_init.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rt2860/rt_linux.c

+0 −20
Original line number Diff line number Diff line
@@ -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.