[PATCH 1/6] Staging: rtl8192u: Remove TRUE and FALSE macros

[PATCH 1/6] Staging: rtl8192u: Remove TRUE and FALSE macros

[Ksenija Stanojevic]

Remove TRUE and FALSE boolean macros, since Linux kernel has already a
boolean type, bool, defined in linux/stddef.h

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
 drivers/staging/rtl8192u/r8192U.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
index c9d8c10..6c2e438 100644
--- a/drivers/staging/rtl8192u/r8192U.h
+++ b/drivers/staging/rtl8192u/r8192U.h
@@ -40,8 +40,6 @@
 #define RTL8192U
 #define RTL819xU_MODULE_NAME "rtl819xU"
 /* HW security */
-#define FALSE 0
-#define TRUE 1
 #define MAX_KEY_LEN     61
 #define KEY_BUF_SIZE    5
 
-- 
1.9.1

[PATCH 2/6] Staging: rtl8192u: Replace TRUE with true

[Ksenija Stanojevic]

Replace all occurrences of TRUE by true.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
 drivers/staging/rtl8192u/r8190_rtl8256.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8190_rtl8256.c b/drivers/staging/rtl8192u/r8190_rtl8256.c
index 1868352..5460894 100644
--- a/drivers/staging/rtl8192u/r8190_rtl8256.c
+++ b/drivers/staging/rtl8192u/r8190_rtl8256.c
@@ -225,7 +225,7 @@ void PHY_SetRF8256CCKTxPower(struct net_device *dev, u8 powerlevel)
 	struct r8192_priv *priv = ieee80211_priv(dev);
 	TxAGC = powerlevel;
 
-	if (priv->bDynamicTxLowPower == TRUE) {
+	if (priv->bDynamicTxLowPower == true) {
 		if (priv->CustomerID == RT_CID_819x_Netcore)
 			TxAGC = 0x22;
 		else
@@ -275,7 +275,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device *dev, u8 powerlevel)
 			priv->Pwr_Track = writeVal_tmp;
 		}
 
-		if (priv->bDynamicTxHighPower == TRUE) {
+		if (priv->bDynamicTxHighPower == true) {
 			/*Add by Jacken 2008/03/06
 			 *Emily, 20080613. Set low tx power for both MCS and legacy OFDM
 			 */
-- 
1.9.1

[PATCH 3/6] Staging: rtl8192u: Replace TRUE and FALSE macros

[Ksenija Stanojevic]

Replace all occurrences of TRUE and FALSE by true and false
respectively.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
 drivers/staging/rtl8192u/r8192U_dm.c | 48 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index ee6b936..2657b57 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -502,7 +502,7 @@ static u8	CCKSwingTable_Ch14[CCK_Table_length][8] = {
 static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
 {
 	struct r8192_priv *priv = ieee80211_priv(dev);
-	bool						bHighpowerstate, viviflag = FALSE;
+	bool						bHighpowerstate, viviflag = false;
 	DCMD_TXCMD_T			tx_cmd;
 	u8						powerlevelOFDM24G;
 	int						i = 0, j = 0, k = 0;
@@ -558,13 +558,13 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
 			/* check if the report value is right */
 			for (k = 0; k < 5; k++) {
 				if (tmp_report[k] <= 20) {
-					viviflag = TRUE;
+					viviflag = true;
 					break;
 				}
 			}
-			if (viviflag == TRUE) {
+			if (viviflag == true) {
 				write_nic_byte(dev, 0x1ba, 0);
-				viviflag = FALSE;
+				viviflag = false;
 				RT_TRACE(COMP_POWER_TRACKING, "we filtered the data\n");
 				for (k = 0; k < 5; k++)
 					tmp_report[k] = 0;
@@ -587,7 +587,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
 				delta = TSSI_13dBm - Avg_TSSI_Meas_from_driver;
 
 			if (delta <= E_FOR_TX_POWER_TRACK) {
-				priv->ieee80211->bdynamic_txpower_enable = TRUE;
+				priv->ieee80211->bdynamic_txpower_enable = true;
 				write_nic_byte(dev, 0x1ba, 0);
 				RT_TRACE(COMP_POWER_TRACKING, "tx power track is done\n");
 				RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex);
@@ -624,10 +624,10 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
 
 			if (priv->cck_present_attentuation > -1 && priv->cck_present_attentuation < 23) {
 				if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
-					priv->bcck_in_ch14 = TRUE;
+					priv->bcck_in_ch14 = true;
 					dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
 				} else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) {
-					priv->bcck_in_ch14 = FALSE;
+					priv->bcck_in_ch14 = false;
 					dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
 				} else
 					dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
@@ -638,7 +638,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
 			RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation = %d\n", priv->cck_present_attentuation);
 
 			if (priv->cck_present_attentuation_difference <= -12 || priv->cck_present_attentuation_difference >= 24) {
-				priv->ieee80211->bdynamic_txpower_enable = TRUE;
+				priv->ieee80211->bdynamic_txpower_enable = true;
 				write_nic_byte(dev, 0x1ba, 0);
 				RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");
 				return;
@@ -651,7 +651,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
 			break;
 		}
 	}
-	priv->ieee80211->bdynamic_txpower_enable = TRUE;
+	priv->ieee80211->bdynamic_txpower_enable = true;
 	write_nic_byte(dev, 0x1ba, 0);
 }
 
@@ -684,7 +684,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
 				break;
 			}
 		}
-		priv->btxpower_trackingInit = TRUE;
+		priv->btxpower_trackingInit = true;
 		/*pHalData->TXPowercount = 0;*/
 		return;
 	}
@@ -734,10 +734,10 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
 		tmpCCKindex = tmpCCK20Mindex;
 
 	if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
-		priv->bcck_in_ch14 = TRUE;
+		priv->bcck_in_ch14 = true;
 		CCKSwingNeedUpdate = 1;
 	} else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) {
-		priv->bcck_in_ch14 = FALSE;
+		priv->bcck_in_ch14 = false;
 		CCKSwingNeedUpdate = 1;
 	}
 
@@ -765,7 +765,7 @@ void dm_txpower_trackingcallback(struct work_struct *work)
 	struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq);
 	struct net_device *dev = priv->ieee80211->dev;
 
-	if (priv->bDcut == TRUE)
+	if (priv->bDcut == true)
 		dm_TXPowerTrackingCallback_TSSI(dev);
 	else
 		dm_TXPowerTrackingCallback_ThermalMeter(dev);
@@ -1273,9 +1273,9 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev)
 	priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[6] = 0x00;
 	priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[7] = 0x00;
 
-	priv->btxpower_tracking = TRUE;
+	priv->btxpower_tracking = true;
 	priv->txpower_count       = 0;
-	priv->btxpower_trackingInit = FALSE;
+	priv->btxpower_trackingInit = false;
 
 }
 
@@ -1289,18 +1289,18 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev)
 	 * 3-wire by driver causes RF to go into a wrong state.
 	 */
 	if (priv->ieee80211->FwRWRF)
-		priv->btxpower_tracking = TRUE;
+		priv->btxpower_tracking = true;
 	else
-		priv->btxpower_tracking = FALSE;
+		priv->btxpower_tracking = false;
 	priv->txpower_count       = 0;
-	priv->btxpower_trackingInit = FALSE;
+	priv->btxpower_trackingInit = false;
 }
 
 void dm_initialize_txpower_tracking(struct net_device *dev)
 {
 	struct r8192_priv *priv = ieee80211_priv(dev);
 
-	if (priv->bDcut == TRUE)
+	if (priv->bDcut == true)
 		dm_InitializeTXPowerTracking_TSSI(dev);
 	else
 		dm_InitializeTXPowerTracking_ThermalMeter(dev);
@@ -1356,7 +1356,7 @@ static void dm_check_txpower_tracking(struct net_device *dev)
 #ifdef RTL8190P
 	dm_CheckTXPowerTracking_TSSI(dev);
 #else
-	if (priv->bDcut == TRUE)
+	if (priv->bDcut == true)
 		dm_CheckTXPowerTracking_TSSI(dev);
 	else
 		dm_CheckTXPowerTracking_ThermalMeter(dev);
@@ -1466,7 +1466,7 @@ void dm_cck_txpower_adjust(struct net_device *dev, bool binch14)
 {	/*  dm_CCKTxPowerAdjust */
 	struct r8192_priv *priv = ieee80211_priv(dev);
 
-	if (priv->bDcut == TRUE)
+	if (priv->bDcut == true)
 		dm_CCKTxPowerAdjust_TSSI(dev, binch14);
 	else
 		dm_CCKTxPowerAdjust_ThermalMeter(dev, binch14);
@@ -2314,7 +2314,7 @@ static void dm_init_ctstoself(struct net_device *dev)
 {
 	struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev);
 
-	priv->ieee80211->bCTSToSelfEnable = TRUE;
+	priv->ieee80211->bCTSToSelfEnable = true;
 	priv->ieee80211->CTSToSelfTH = CTSToSelfTHVal;
 }
 
@@ -2327,7 +2327,7 @@ static void dm_ctstoself(struct net_device *dev)
 	unsigned long						curTxOkCnt = 0;
 	unsigned long						curRxOkCnt = 0;
 
-	if (priv->ieee80211->bCTSToSelfEnable != TRUE) {
+	if (priv->ieee80211->bCTSToSelfEnable != true) {
 		pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
 		return;
 	}
@@ -3087,7 +3087,7 @@ static void dm_dynamic_txpower(struct net_device *dev)
 #endif
 
 		rtl8192_phy_setTxPower(dev, priv->ieee80211->current_network.channel);
-		/*pHalData->bStartTxCtrlByTPCNFR = FALSE;    Clear th flag of Set TX Power from Sitesurvey*/
+		/*pHalData->bStartTxCtrlByTPCNFR = false;    Clear th flag of Set TX Power from Sitesurvey*/
 	}
 	priv->bLastDTPFlag_High = priv->bDynamicTxHighPower;
 	priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower;
-- 
1.9.1

[PATCH 4/6] Staging: rtl8192u: Replace TRUE and FALSE macros

[Ksenija Stanojevic]

Replace all occurrences of TRUE and FALSE by true and false
respectively.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
 drivers/staging/rtl8192u/r819xU_phy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index 0589602..7902cec 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -1187,7 +1187,7 @@ bool rtl8192_SetRFPowerState(struct net_device *dev,
 				/* Turn on RF we are still linked, which might
 				   happen when we quickly turn off and on HW RF.
 				 */
-				if (pMgntInfo->bMediaConnect == TRUE)
+				if (pMgntInfo->bMediaConnect == true)
 					Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_LINK);
 				else
 					/* Turn off LED if RF is not ON. */
@@ -1579,10 +1579,10 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
 			 priv->cck_present_attentuation);
 
 		if (priv->chan == 14 && !priv->bcck_in_ch14) {
-			priv->bcck_in_ch14 = TRUE;
+			priv->bcck_in_ch14 = true;
 			dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
 		} else if (priv->chan != 14 && priv->bcck_in_ch14) {
-			priv->bcck_in_ch14 = FALSE;
+			priv->bcck_in_ch14 = false;
 			dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
 		} else {
 			dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
-- 
1.9.1

[PATCH 5/6] Staging: rtl8192u: Repace TRUE and FALSE macros

[Ksenija Stanojevic]

Replace all occurrences oof TRUE and FALSE by true and false
respectively.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
 drivers/staging/rtl8192u/r819xU_firmware.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c
index c230be2..1a3a09f 100644
--- a/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
@@ -164,7 +164,7 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
 
 CPUCheckMainCodeOKAndTurnOnCPU_Fail:
 	RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
-	rt_status = FALSE;
+	rt_status = false;
 	return rt_status;
 }
 
@@ -201,7 +201,7 @@ CPUCheckFirmwareReady_Fail:
 bool init_firmware(struct net_device *dev)
 {
 	struct r8192_priv	*priv = ieee80211_priv(dev);
-	bool			rt_status = TRUE;
+	bool			rt_status = true;
 
 	u32			file_length = 0;
 	u8			*mapped_file = NULL;
@@ -281,7 +281,7 @@ bool init_firmware(struct net_device *dev)
 		if (rst_opt == OPT_SYSTEM_RESET)
 			release_firmware(fw_entry);
 
-		if (rt_status != TRUE)
+		if (rt_status != true)
 			goto download_firmware_fail;
 
 		switch (init_step) {
@@ -304,7 +304,7 @@ bool init_firmware(struct net_device *dev)
 
 			/* Check Put Code OK and Turn On CPU */
 			rt_status = CPUcheck_maincodeok_turnonCPU(dev);
-			if (rt_status != TRUE) {
+			if (rt_status != true) {
 				RT_TRACE(COMP_ERR, "CPUcheck_maincodeok_turnonCPU fail!\n");
 				goto download_firmware_fail;
 			}
@@ -318,7 +318,7 @@ bool init_firmware(struct net_device *dev)
 			mdelay(1);
 
 			rt_status = CPUcheck_firmware_ready(dev);
-			if (rt_status != TRUE) {
+			if (rt_status != true) {
 				RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n",rt_status);
 				goto download_firmware_fail;
 			}
@@ -336,7 +336,7 @@ bool init_firmware(struct net_device *dev)
 
 download_firmware_fail:
 	RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
-	rt_status = FALSE;
+	rt_status = false;
 	return rt_status;
 
 }
-- 
1.9.1

[PATCH 6/6] Staging: rtl8192u: Repace TRUE and FALSE macros

[Ksenija Stanojevic]

Replace all occurrences oof TRUE and FALSE by true and false
respectively.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
 drivers/staging/rtl8192u/r8192U_core.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index e031a25..02707d8 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -2767,7 +2767,7 @@ static bool rtl8192_adapter_start(struct net_device *dev)
 	//
 #ifdef TO_DO_LIST
 	if (Adapter->ResetProgress == RESET_TYPE_NORESET) {
-		if (pMgntInfo->RegRfOff == TRUE) { /* User disable RF via registry. */
+		if (pMgntInfo->RegRfOff == true) { /* User disable RF via registry. */
 			RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n"));
 			MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW);
 			// Those actions will be discard in MgntActSet_RF_State because of the same state
@@ -2814,15 +2814,15 @@ static bool rtl8192_adapter_start(struct net_device *dev)
 		u8 tmpvalue;
 		read_nic_byte(dev, 0x301, &tmpvalue);
 		if (tmpvalue == 0x03) {
-			priv->bDcut = TRUE;
+			priv->bDcut = true;
 			RT_TRACE(COMP_POWER_TRACKING, "D-cut\n");
 		} else {
-			priv->bDcut = FALSE;
+			priv->bDcut = false;
 			RT_TRACE(COMP_POWER_TRACKING, "C-cut\n");
 		}
 		dm_initialize_txpower_tracking(dev);
 
-		if (priv->bDcut == TRUE) {
+		if (priv->bDcut == true) {
 			u32 i, TempCCk;
 			u32 tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, bMaskDWord);
 			for (i = 0; i < TxBBGainTableLength; i++) {
@@ -2874,11 +2874,11 @@ static bool HalTxCheckStuck819xUsb(struct net_device *dev)
 {
 	struct r8192_priv *priv = ieee80211_priv(dev);
 	u16		RegTxCounter;
-	bool		bStuck = FALSE;
+	bool		bStuck = false;
 	read_nic_word(dev, 0x128, &RegTxCounter);
 	RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n", __func__, RegTxCounter, priv->TxCounter);
 	if (priv->TxCounter == RegTxCounter)
-		bStuck = TRUE;
+		bStuck = true;
 
 	priv->TxCounter = RegTxCounter;
 
@@ -2920,7 +2920,7 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev)
 {
 	u16	RegRxCounter;
 	struct r8192_priv *priv = ieee80211_priv(dev);
-	bool bStuck = FALSE;
+	bool bStuck = false;
 	static u8	rx_chk_cnt;
 	read_nic_word(dev, 0x130, &RegRxCounter);
 	RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d,RxCounter is %d\n", __func__, RegRxCounter, priv->RxCounter);
@@ -2951,7 +2951,7 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev)
 	}
 
 	if (priv->RxCounter == RegRxCounter)
-		bStuck = TRUE;
+		bStuck = true;
 
 	priv->RxCounter = RegRxCounter;
 
@@ -2961,10 +2961,10 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev)
 static RESET_TYPE RxCheckStuck(struct net_device *dev)
 {
 	struct r8192_priv *priv = ieee80211_priv(dev);
-	bool        bRxCheck = FALSE;
+	bool        bRxCheck = false;
 
 	if (priv->IrpPendingCount > 1)
-		bRxCheck = TRUE;
+		bRxCheck = true;
 
 	if (bRxCheck) {
 		if (HalRxCheckStuck819xUsb(dev)) {
@@ -4208,7 +4208,7 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
 	struct net_device *dev = info->dev;
 	struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 	bool bpacket_match_bssid, bpacket_toself;
-	bool bPacketBeacon = FALSE, bToSelfBA = FALSE;
+	bool bPacketBeacon = false, bToSelfBA = false;
 	static struct ieee80211_rx_stats  previous_stats;
 	struct ieee80211_hdr_3addr *hdr;//by amy
 	u16 fc, type;
-- 
1.9.1

Re: [Outreachy kernel] [PATCH 1/6] Staging: rtl8192u: Remove TRUE and FALSE macros

[Arnd Bergmann]

On Tuesday 24 February 2015 18:30:30 Ksenija Stanojevic wrote:
> Remove TRUE and FALSE boolean macros, since Linux kernel has already a
> boolean type, bool, defined in linux/stddef.h
> 
> Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
> ---
>  drivers/staging/rtl8192u/r8192U.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
> index c9d8c10..6c2e438 100644
> --- a/drivers/staging/rtl8192u/r8192U.h
> +++ b/drivers/staging/rtl8192u/r8192U.h
> @@ -40,8 +40,6 @@
>  #define RTL8192U
>  #define RTL819xU_MODULE_NAME "rtl819xU"
>  /* HW security */
> -#define FALSE 0
> -#define TRUE 1
>  #define MAX_KEY_LEN     61
>  #define KEY_BUF_SIZE    5

The patches in this series all look good to me, but the order is wrong:
You should first change all users of the macro and remove it in the final
patch. Alternatively you could submit a single larger patch to do it
all at once. There is not really a reason to split it up by file if
all the changes are for the same driver and are completely trivial.

	Arnd

Re: [Outreachy kernel] [PATCH 1/6] Staging: rtl8192u: Remove TRUE and FALSE macros

[Ksenija Stanojević]

On Tue, Feb 24, 2015 at 8:03 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Tuesday 24 February 2015 18:30:30 Ksenija Stanojevic wrote:
> > Remove TRUE and FALSE boolean macros, since Linux kernel has already a
> > boolean type, bool, defined in linux/stddef.h
> >
> > Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
> > ---
> >  drivers/staging/rtl8192u/r8192U.h | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
> > index c9d8c10..6c2e438 100644
> > --- a/drivers/staging/rtl8192u/r8192U.h
> > +++ b/drivers/staging/rtl8192u/r8192U.h
> > @@ -40,8 +40,6 @@
> >  #define RTL8192U
> >  #define RTL819xU_MODULE_NAME "rtl819xU"
> >  /* HW security */
> > -#define FALSE 0
> > -#define TRUE 1
> >  #define MAX_KEY_LEN     61
> >  #define KEY_BUF_SIZE    5
>
> The patches in this series all look good to me, but the order is wrong:
> You should first change all users of the macro and remove it in the final
> patch. Alternatively you could submit a single larger patch to do it
> all at once. There is not really a reason to split it up by file if
> all the changes are for the same driver and are completely trivial.
>
>         Arnd

Ok,  but should I also change TRUE and FALSE to true and false in
 commented code?

Re: [Outreachy kernel] [PATCH 1/6] Staging: rtl8192u: Remove TRUE and FALSE macros

[Julia Lawall]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1520 bytes --]

On Tue, 24 Feb 2015, Ksenija Stanojević wrote:

> On Tue, Feb 24, 2015 at 8:03 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > On Tuesday 24 February 2015 18:30:30 Ksenija Stanojevic wrote:
> > > Remove TRUE and FALSE boolean macros, since Linux kernel has already a
> > > boolean type, bool, defined in linux/stddef.h
> > >
> > > Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
> > > ---
> > >  drivers/staging/rtl8192u/r8192U.h | 2 --
> > >  1 file changed, 2 deletions(-)
> > >
> > > diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
> > > index c9d8c10..6c2e438 100644
> > > --- a/drivers/staging/rtl8192u/r8192U.h
> > > +++ b/drivers/staging/rtl8192u/r8192U.h
> > > @@ -40,8 +40,6 @@
> > >  #define RTL8192U
> > >  #define RTL819xU_MODULE_NAME "rtl819xU"
> > >  /* HW security */
> > > -#define FALSE 0
> > > -#define TRUE 1
> > >  #define MAX_KEY_LEN     61
> > >  #define KEY_BUF_SIZE    5
> >
> > The patches in this series all look good to me, but the order is wrong:
> > You should first change all users of the macro and remove it in the final
> > patch. Alternatively you could submit a single larger patch to do it
> > all at once. There is not really a reason to split it up by file if
> > all the changes are for the same driver and are completely trivial.
> >
> >         Arnd
> 
> Ok,  but should I also change TRUE and FALSE to true and false in
>  commented code?

Is there a lot of it?  One could consider whether it should just be 
removed.

julia

Re: [Outreachy kernel] [PATCH 1/6] Staging: rtl8192u: Remove TRUE and FALSE macros

[Ksenija Stanojević]

On Tue, Feb 24, 2015 at 8:29 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Tue, 24 Feb 2015, Ksenija Stanojević wrote:
>
>> On Tue, Feb 24, 2015 at 8:03 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> >
>> > On Tuesday 24 February 2015 18:30:30 Ksenija Stanojevic wrote:
>> > > Remove TRUE and FALSE boolean macros, since Linux kernel has already a
>> > > boolean type, bool, defined in linux/stddef.h
>> > >
>> > > Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
>> > > ---
>> > >  drivers/staging/rtl8192u/r8192U.h | 2 --
>> > >  1 file changed, 2 deletions(-)
>> > >
>> > > diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
>> > > index c9d8c10..6c2e438 100644
>> > > --- a/drivers/staging/rtl8192u/r8192U.h
>> > > +++ b/drivers/staging/rtl8192u/r8192U.h
>> > > @@ -40,8 +40,6 @@
>> > >  #define RTL8192U
>> > >  #define RTL819xU_MODULE_NAME "rtl819xU"
>> > >  /* HW security */
>> > > -#define FALSE 0
>> > > -#define TRUE 1
>> > >  #define MAX_KEY_LEN     61
>> > >  #define KEY_BUF_SIZE    5
>> >
>> > The patches in this series all look good to me, but the order is wrong:
>> > You should first change all users of the macro and remove it in the final
>> > patch. Alternatively you could submit a single larger patch to do it
>> > all at once. There is not really a reason to split it up by file if
>> > all the changes are for the same driver and are completely trivial.
>> >
>> >         Arnd
>>
>> Ok,  but should I also change TRUE and FALSE to true and false in
>>  commented code?
>
> Is there a lot of it?  One could consider whether it should just be
> removed.
>
> julia

Only at few places there are instances of TRUE, FALSE,
but  there is a lot of commented code.

Re: [Outreachy kernel] [PATCH 2/6] Staging: rtl8192u: Replace TRUE with true

[Julia Lawall]

> -	if (priv->bDynamicTxLowPower == TRUE) {
> +	if (priv->bDynamicTxLowPower == true) {

One could wonder if this could just be:

if (priv->bDynamicTxLowPower) { ...

To check this, you have to go find all of the initializations of this 
field and check that 0 and 1 are the only possible values.

julia

>  		if (priv->CustomerID == RT_CID_819x_Netcore)
>  			TxAGC = 0x22;
>  		else
> @@ -275,7 +275,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device *dev, u8 powerlevel)
>  			priv->Pwr_Track = writeVal_tmp;
>  		}
>  
> -		if (priv->bDynamicTxHighPower == TRUE) {
> +		if (priv->bDynamicTxHighPower == true) {
>  			/*Add by Jacken 2008/03/06
>  			 *Emily, 20080613. Set low tx power for both MCS and legacy OFDM
>  			 */
> -- 
> 1.9.1
> 
> -- 
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/4ceaa6f20532b3112484ecaa074106d1c130c6c6.1424798953.git.ksenija.stanojevic%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
> 

Re: [Outreachy kernel] [PATCH 3/6] Staging: rtl8192u: Replace TRUE and FALSE macros

[Julia Lawall]

On Tue, 24 Feb 2015, Ksenija Stanojevic wrote:

> Replace all occurrences of TRUE and FALSE by true and false
> respectively.
> 
> Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
> ---
>  drivers/staging/rtl8192u/r8192U_dm.c | 48 ++++++++++++++++++------------------
>  1 file changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
> index ee6b936..2657b57 100644
> --- a/drivers/staging/rtl8192u/r8192U_dm.c
> +++ b/drivers/staging/rtl8192u/r8192U_dm.c
> @@ -502,7 +502,7 @@ static u8	CCKSwingTable_Ch14[CCK_Table_length][8] = {
>  static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
>  {
>  	struct r8192_priv *priv = ieee80211_priv(dev);
> -	bool						bHighpowerstate, viviflag = FALSE;
> +	bool						bHighpowerstate, viviflag = false;
>  	DCMD_TXCMD_T			tx_cmd;
>  	u8						powerlevelOFDM24G;
>  	int						i = 0, j = 0, k = 0;

It's another issue, but you could send anoter patch to delete the 
excessive indentation of these variables.

julia

> @@ -558,13 +558,13 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
>  			/* check if the report value is right */
>  			for (k = 0; k < 5; k++) {
>  				if (tmp_report[k] <= 20) {
> -					viviflag = TRUE;
> +					viviflag = true;
>  					break;
>  				}
>  			}
> -			if (viviflag == TRUE) {
> +			if (viviflag == true) {
>  				write_nic_byte(dev, 0x1ba, 0);
> -				viviflag = FALSE;
> +				viviflag = false;
>  				RT_TRACE(COMP_POWER_TRACKING, "we filtered the data\n");
>  				for (k = 0; k < 5; k++)
>  					tmp_report[k] = 0;
> @@ -587,7 +587,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
>  				delta = TSSI_13dBm - Avg_TSSI_Meas_from_driver;
>  
>  			if (delta <= E_FOR_TX_POWER_TRACK) {
> -				priv->ieee80211->bdynamic_txpower_enable = TRUE;
> +				priv->ieee80211->bdynamic_txpower_enable = true;
>  				write_nic_byte(dev, 0x1ba, 0);
>  				RT_TRACE(COMP_POWER_TRACKING, "tx power track is done\n");
>  				RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex);
> @@ -624,10 +624,10 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
>  
>  			if (priv->cck_present_attentuation > -1 && priv->cck_present_attentuation < 23) {
>  				if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
> -					priv->bcck_in_ch14 = TRUE;
> +					priv->bcck_in_ch14 = true;
>  					dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
>  				} else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) {
> -					priv->bcck_in_ch14 = FALSE;
> +					priv->bcck_in_ch14 = false;
>  					dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
>  				} else
>  					dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
> @@ -638,7 +638,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
>  			RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation = %d\n", priv->cck_present_attentuation);
>  
>  			if (priv->cck_present_attentuation_difference <= -12 || priv->cck_present_attentuation_difference >= 24) {
> -				priv->ieee80211->bdynamic_txpower_enable = TRUE;
> +				priv->ieee80211->bdynamic_txpower_enable = true;
>  				write_nic_byte(dev, 0x1ba, 0);
>  				RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");
>  				return;
> @@ -651,7 +651,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
>  			break;
>  		}
>  	}
> -	priv->ieee80211->bdynamic_txpower_enable = TRUE;
> +	priv->ieee80211->bdynamic_txpower_enable = true;
>  	write_nic_byte(dev, 0x1ba, 0);
>  }
>  
> @@ -684,7 +684,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
>  				break;
>  			}
>  		}
> -		priv->btxpower_trackingInit = TRUE;
> +		priv->btxpower_trackingInit = true;
>  		/*pHalData->TXPowercount = 0;*/
>  		return;
>  	}
> @@ -734,10 +734,10 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
>  		tmpCCKindex = tmpCCK20Mindex;
>  
>  	if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
> -		priv->bcck_in_ch14 = TRUE;
> +		priv->bcck_in_ch14 = true;
>  		CCKSwingNeedUpdate = 1;
>  	} else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) {
> -		priv->bcck_in_ch14 = FALSE;
> +		priv->bcck_in_ch14 = false;
>  		CCKSwingNeedUpdate = 1;
>  	}
>  
> @@ -765,7 +765,7 @@ void dm_txpower_trackingcallback(struct work_struct *work)
>  	struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq);
>  	struct net_device *dev = priv->ieee80211->dev;
>  
> -	if (priv->bDcut == TRUE)
> +	if (priv->bDcut == true)
>  		dm_TXPowerTrackingCallback_TSSI(dev);
>  	else
>  		dm_TXPowerTrackingCallback_ThermalMeter(dev);
> @@ -1273,9 +1273,9 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev)
>  	priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[6] = 0x00;
>  	priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[7] = 0x00;
>  
> -	priv->btxpower_tracking = TRUE;
> +	priv->btxpower_tracking = true;
>  	priv->txpower_count       = 0;
> -	priv->btxpower_trackingInit = FALSE;
> +	priv->btxpower_trackingInit = false;
>  
>  }
>  
> @@ -1289,18 +1289,18 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev)
>  	 * 3-wire by driver causes RF to go into a wrong state.
>  	 */
>  	if (priv->ieee80211->FwRWRF)
> -		priv->btxpower_tracking = TRUE;
> +		priv->btxpower_tracking = true;
>  	else
> -		priv->btxpower_tracking = FALSE;
> +		priv->btxpower_tracking = false;
>  	priv->txpower_count       = 0;
> -	priv->btxpower_trackingInit = FALSE;
> +	priv->btxpower_trackingInit = false;
>  }
>  
>  void dm_initialize_txpower_tracking(struct net_device *dev)
>  {
>  	struct r8192_priv *priv = ieee80211_priv(dev);
>  
> -	if (priv->bDcut == TRUE)
> +	if (priv->bDcut == true)
>  		dm_InitializeTXPowerTracking_TSSI(dev);
>  	else
>  		dm_InitializeTXPowerTracking_ThermalMeter(dev);
> @@ -1356,7 +1356,7 @@ static void dm_check_txpower_tracking(struct net_device *dev)
>  #ifdef RTL8190P
>  	dm_CheckTXPowerTracking_TSSI(dev);
>  #else
> -	if (priv->bDcut == TRUE)
> +	if (priv->bDcut == true)
>  		dm_CheckTXPowerTracking_TSSI(dev);
>  	else
>  		dm_CheckTXPowerTracking_ThermalMeter(dev);
> @@ -1466,7 +1466,7 @@ void dm_cck_txpower_adjust(struct net_device *dev, bool binch14)
>  {	/*  dm_CCKTxPowerAdjust */
>  	struct r8192_priv *priv = ieee80211_priv(dev);
>  
> -	if (priv->bDcut == TRUE)
> +	if (priv->bDcut == true)
>  		dm_CCKTxPowerAdjust_TSSI(dev, binch14);
>  	else
>  		dm_CCKTxPowerAdjust_ThermalMeter(dev, binch14);
> @@ -2314,7 +2314,7 @@ static void dm_init_ctstoself(struct net_device *dev)
>  {
>  	struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev);
>  
> -	priv->ieee80211->bCTSToSelfEnable = TRUE;
> +	priv->ieee80211->bCTSToSelfEnable = true;
>  	priv->ieee80211->CTSToSelfTH = CTSToSelfTHVal;
>  }
>  
> @@ -2327,7 +2327,7 @@ static void dm_ctstoself(struct net_device *dev)
>  	unsigned long						curTxOkCnt = 0;
>  	unsigned long						curRxOkCnt = 0;
>  
> -	if (priv->ieee80211->bCTSToSelfEnable != TRUE) {
> +	if (priv->ieee80211->bCTSToSelfEnable != true) {
>  		pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
>  		return;
>  	}
> @@ -3087,7 +3087,7 @@ static void dm_dynamic_txpower(struct net_device *dev)
>  #endif
>  
>  		rtl8192_phy_setTxPower(dev, priv->ieee80211->current_network.channel);
> -		/*pHalData->bStartTxCtrlByTPCNFR = FALSE;    Clear th flag of Set TX Power from Sitesurvey*/
> +		/*pHalData->bStartTxCtrlByTPCNFR = false;    Clear th flag of Set TX Power from Sitesurvey*/
>  	}
>  	priv->bLastDTPFlag_High = priv->bDynamicTxHighPower;
>  	priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower;
> -- 
> 1.9.1
> 
> -- 
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/0c2eddc15c4c507fdc132a98763175a6da316aa7.1424798953.git.ksenija.stanojevic%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
> 

Re: [Outreachy kernel] [PATCH 2/6] Staging: rtl8192u: Replace TRUE with true

[Ksenija Stanojević]

On Tue, Feb 24, 2015 at 8:33 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>> -     if (priv->bDynamicTxLowPower == TRUE) {
>> +     if (priv->bDynamicTxLowPower == true) {
>
> One could wonder if this could just be:
>
> if (priv->bDynamicTxLowPower) { ...
>
> To check this, you have to go find all of the initializations of this
> field and check that 0 and 1 are the only possible values.
>
> julia
>
Field is of bool type so it's possible, but this is not the only place
where such change could take place. Should i use a script?

>>               if (priv->CustomerID == RT_CID_819x_Netcore)
>>                       TxAGC = 0x22;
>>               else
>> @@ -275,7 +275,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device *dev, u8 powerlevel)
>>                       priv->Pwr_Track = writeVal_tmp;
>>               }
>>
>> -             if (priv->bDynamicTxHighPower == TRUE) {
>> +             if (priv->bDynamicTxHighPower == true) {
>>                       /*Add by Jacken 2008/03/06
>>                        *Emily, 20080613. Set low tx power for both MCS and legacy OFDM
>>                        */
>> --
>> 1.9.1
>>
>> --
>> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/4ceaa6f20532b3112484ecaa074106d1c130c6c6.1424798953.git.ksenija.stanojevic%40gmail.com.
>> For more options, visit https://groups.google.com/d/optout.
>>

Re: [Outreachy kernel] [PATCH 2/6] Staging: rtl8192u: Replace TRUE with true

[Julia Lawall]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2139 bytes --]

On Tue, 24 Feb 2015, Ksenija Stanojević wrote:

> On Tue, Feb 24, 2015 at 8:33 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> >> -     if (priv->bDynamicTxLowPower == TRUE) {
> >> +     if (priv->bDynamicTxLowPower == true) {
> >
> > One could wonder if this could just be:
> >
> > if (priv->bDynamicTxLowPower) { ...
> >
> > To check this, you have to go find all of the initializations of this
> > field and check that 0 and 1 are the only possible values.
> >
> > julia
> >
> Field is of bool type so it's possible, but this is not the only place
> where such change could take place. Should i use a script?

You could do this with Coccinelle, but it is probably not the easiest 
Coccinelle project to start with.  For now, I think it could be useful to 
go around and look at the occurrences by hand, to see what the issues are.  
I would suggest to do one field at a time, so that the work is not 
overwhelming.

julia

> >>               if (priv->CustomerID == RT_CID_819x_Netcore)
> >>                       TxAGC = 0x22;
> >>               else
> >> @@ -275,7 +275,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device *dev, u8 powerlevel)
> >>                       priv->Pwr_Track = writeVal_tmp;
> >>               }
> >>
> >> -             if (priv->bDynamicTxHighPower == TRUE) {
> >> +             if (priv->bDynamicTxHighPower == true) {
> >>                       /*Add by Jacken 2008/03/06
> >>                        *Emily, 20080613. Set low tx power for both MCS and legacy OFDM
> >>                        */
> >> --
> >> 1.9.1
> >>
> >> --
> >> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> >> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> >> To post to this group, send email to outreachy-kernel@googlegroups.com.
> >> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/4ceaa6f20532b3112484ecaa074106d1c130c6c6.1424798953.git.ksenija.stanojevic%40gmail.com.
> >> For more options, visit https://groups.google.com/d/optout.
> >>
>