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

Commit eb1397d1 authored by Gargi Sharma's avatar Gargi Sharma Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: Remove ternary operator 



Relational and logical operators evaluate to either true or false.
Lines with ternary operators were found using coccinelle script. In a
few cases using logical && operator would suffice. Hence those were
changed to improve readability.

Coccinelle Script:
@r@
expression A,B;
symbol true,false;
binary operator b = {==,!=,&&,||,>=,<=,>,<};
@@
- (A b B) ? true : false
+ A b B

Signed-off-by: default avatarGargi Sharma <gs051095@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 483b1008

drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c

+7 −8
Original line number Diff line number Diff line
@@ -976,17 +976,16 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) 
	//

	HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));



//	if (pHTInfo->bCurBW40MHz)

		pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);

	pHTInfo->bCurTxBW40MHz = (pPeerHTInfo->RecommemdedTxWidth == 1);



	//

	// Update short GI/ long GI setting

	//

	// TODO:

	pHTInfo->bCurShortGI20MHz=

		((pHTInfo->bRegShortGI20MHz)?((pPeerHTCap->ShortGI20Mhz==1)?true:false):false);

	pHTInfo->bCurShortGI40MHz=

		((pHTInfo->bRegShortGI40MHz)?((pPeerHTCap->ShortGI40Mhz==1)?true:false):false);

	pHTInfo->bCurShortGI20MHz = pHTInfo->bRegShortGI20MHz &&

				    (pPeerHTCap->ShortGI20Mhz == 1);

	pHTInfo->bCurShortGI40MHz = pHTInfo->bRegShortGI40MHz &&

				   (pPeerHTCap->ShortGI40Mhz == 1);



	//

	// Config TX STBC setting
@@ -997,8 +996,8 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) 
	// Config DSSS/CCK  mode in 40MHz mode

	//

	// TODO:

	pHTInfo->bCurSuppCCK =

		((pHTInfo->bRegSuppCCK)?((pPeerHTCap->DssCCk==1)?true:false):false);

	pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK &&

			       (pPeerHTCap->DssCCk == 1);





	//