Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: rt28x0: fix some build warnings 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44c68c23

drivers/staging/rt2860/chip/rtmp_phy.h

+4 −4
Original line number Diff line number Diff line
@@ -552,8 +552,8 @@ 
#ifdef RT30xx

#define RTMP_ASIC_MMPS_DISABLE(_pAd)							\

	do{															\

		UCHAR _bbpData;											\

		UINT32 _macData; \

		UCHAR _bbpData = 0; \

		/* disable MMPS BBP control register */						\

		RTMP_BBP_IO_READ8_BY_REG_ID(_pAd, BBP_R3, &_bbpData);	\

		_bbpData &= ~(0x04);	/*bit 2*/								\
@@ -568,8 +568,8 @@ 


#define RTMP_ASIC_MMPS_ENABLE(_pAd)							\

	do{															\

		UCHAR _bbpData;											\

		UINT32 _macData; \

		UCHAR _bbpData = 0; \

		/* enable MMPS BBP control register */						\

		RTMP_BBP_IO_READ8_BY_REG_ID(_pAd, BBP_R3, &_bbpData);	\

		_bbpData |= (0x04);	/*bit 2*/								\

drivers/staging/rt2860/chips/rt30xx.c

+2 −0
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ VOID RT30xxSetRxAnt( 
	IN UCHAR			Ant)

{

	UINT32	Value;

#ifdef RTMP_MAC_PCI

	UINT32	x;

#endif



	if ((pAd->EepromAccess) ||

		(RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS))	||

drivers/staging/rt2860/common/cmm_asic.c

+3 −3
Original line number Diff line number Diff line
@@ -810,9 +810,9 @@ VOID AsicSwitchChannel( 


#if defined(RT3090) || defined(RT3390)

		// PCIe PHY Transmit attenuation adjustment

		if (IS_RT3090A(pAd) || IS_RT3390(pAd))

		{

			TX_ATTENUATION_CTRL_STRUC TxAttenuationCtrl = {0};

		if (IS_RT3090A(pAd) || IS_RT3390(pAd)) {

			TX_ATTENUATION_CTRL_STRUC

				TxAttenuationCtrl = { .word = 0 };



			RTMP_IO_READ32(pAd, PCIE_PHY_TX_ATTENUATION_CTRL, &TxAttenuationCtrl.word);

drivers/staging/rt2860/common/cmm_mac_pci.c

+3 −4
Original line number Diff line number Diff line
@@ -1173,10 +1173,9 @@ BOOLEAN RT28xxPciAsicRadioOn( 
	    pAd->Mlme.bPsPollTimerRunning = FALSE;

		RTMPCancelTimer(&pAd->Mlme.PsPollTimer,	&Cancelled);

		}

		if ((pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)&&

		((Level == GUIRADIO_OFF) || (Level == GUI_IDLE_POWER_SAVE))

		||(RTMP_TEST_PSFLAG(pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND)))

		{

		if ((pAd->StaCfg.PSControl.field.EnableNewPS == TRUE &&

		     (Level == GUIRADIO_OFF || Level == GUI_IDLE_POWER_SAVE)) ||

		    RTMP_TEST_PSFLAG(pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND)) {

			// Some chips don't need to delay 6ms, so copy RTMPPCIePowerLinkCtrlRestore

			// return condition here.

			/*

drivers/staging/rt2860/common/mlme.c

+0 −1
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ VOID MlmePeriodicExec( 
{

	ULONG			TxTotalCnt;

	PRTMP_ADAPTER	pAd = (RTMP_ADAPTER *)FunctionContext;

	SHORT	realavgrssi;



#ifdef RTMP_MAC_PCI

	{