[PATCH 4/7] Staging: bcm: DDRInit: fixed parentheses coding style issues

Gary Rookard garyrookard at gmail.com
Tue Dec 10 11:05:32 UTC 2013


Fixed coding style issues

Signed-off-by: Gary Alan Rookard <garyrookard at gmail.com>
---
On branch staging-next
 drivers/staging/bcm/DDRInit.c | 99 +++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index a177cfe..8408640 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -798,7 +798,7 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 			psDDRSetting = asT3LP_DDRSetting133MHz;
 			RegCount = (sizeof(asT3LP_DDRSetting133MHz)/
 			sizeof(struct bcm_ddr_setting));
-			if(Adapter->bMipsConfig == MIPS_200_MHZ)
+			if (Adapter->bMipsConfig == MIPS_200_MHZ)
 				uiClockSetting = 0x03F13652;
 			else
 				uiClockSetting = 0x03F1365B;
@@ -816,22 +816,22 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 		/* Set bit 2 and bit 6 to 1 for BBIC 2mA drive
 		 * (please check current value and additionally set these bits)
 		 */
-	if( (Adapter->chip_id !=  BCS220_2) &&
+	if ((Adapter->chip_id !=  BCS220_2) &&
 		(Adapter->chip_id !=  BCS220_2BC) &&
-		(Adapter->chip_id != BCS220_3) ) {
+		(Adapter->chip_id != BCS220_3)) {
 			retval = rdmalt(Adapter, (UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 				}
 				uiResetValue |= 0x44;
 				retval = wrmalt(Adapter, (UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
 	}
-		switch(Adapter->DDRSetting) {
+		switch (Adapter->DDRSetting) {
 		case DDR_80_MHZ:
 			psDDRSetting = asT3LPB_DDRSetting80MHz;
 			RegCount = (sizeof(asT3B_DDRSetting80MHz)/
@@ -847,7 +847,7 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 			RegCount = (sizeof(asT3B_DDRSetting133MHz)/
 			sizeof(struct bcm_ddr_setting));
 
-			if(Adapter->bMipsConfig == MIPS_200_MHZ)
+			if (Adapter->bMipsConfig == MIPS_200_MHZ)
 				uiClockSetting = 0x03F13652;
 			else
 				uiClockSetting = 0x03F1365B;
@@ -857,7 +857,7 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 			psDDRSetting = asT3LPB_DDRSetting160MHz;
 			RegCount = sizeof(asT3LPB_DDRSetting160MHz)/sizeof(struct bcm_ddr_setting);
 
-			if(Adapter->bMipsConfig == MIPS_200_MHZ)
+			if (Adapter->bMipsConfig == MIPS_200_MHZ)
 				uiClockSetting = 0x03F137D2;
 			else
 				uiClockSetting = 0x03F137DB;
@@ -902,10 +902,9 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 			RegCount = (sizeof(asT3B_DDRSetting100MHz)/
 			sizeof(struct bcm_ddr_setting));
 			break;
-			case DDR_133_MHZ:
+		case DDR_133_MHZ:
 
-			if(Adapter->bDPLLConfig == PLL_266_MHZ) {//266Mhz PLL selected.
-				
+			if (Adapter->bDPLLConfig == PLL_266_MHZ) {  //266Mhz PLL selected.
 				memcpy(asT3B_DDRSetting133MHz, asDPLL_266MHZ,
 					sizeof(asDPLL_266MHZ));
 				psDDRSetting = asT3B_DDRSetting133MHz;
@@ -915,7 +914,7 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 				psDDRSetting = asT3B_DDRSetting133MHz;
 				RegCount = (sizeof(asT3B_DDRSetting133MHz)/
 				sizeof(struct bcm_ddr_setting));
-				if(Adapter->bMipsConfig == MIPS_200_MHZ) 
+				if (Adapter->bMipsConfig == MIPS_200_MHZ)
 					uiClockSetting = 0x07F13652;
 				else
 					uiClockSetting = 0x07F1365B;
@@ -926,22 +925,22 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 		}
 		break;
 
-	
+
 	default:
 		return -EINVAL;
 	}
 
 	value = 0;
 	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Register Count is =%lu\n", RegCount);
-	while(RegCount && !retval) {
+	while (RegCount && !retval) {
 
-		if(uiClockSetting && psDDRSetting->ulRegAddress == MIPS_CLOCK_REG)
+		if (uiClockSetting && psDDRSetting->ulRegAddress == MIPS_CLOCK_REG)
 			value = uiClockSetting;
 		else
 			value = psDDRSetting->ulRegValue;
 
 		retval = wrmalt(Adapter, psDDRSetting->ulRegAddress, &value, sizeof(value));
-		if(STATUS_SUCCESS != retval) {
+		if (STATUS_SUCCESS != retval) {
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__);
 			break;
 		}
@@ -950,34 +949,34 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 		psDDRSetting++;
 	}
 
-	if(Adapter->chip_id >= 0xbece3300  ) {
+	if (Adapter->chip_id >= 0xbece3300) {
 
 		mdelay(3);
-		if( (Adapter->chip_id != BCS220_2) &&
+		if ((Adapter->chip_id != BCS220_2) &&
 			(Adapter->chip_id != BCS220_2BC) &&
 			(Adapter->chip_id != BCS220_3)) {
 			/* drive MDDR to half in case of UMA-B:	*/
 			uiResetValue = 0x01010001;
 			retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
 				uiResetValue = 0x00040020;
 				retval = wrmalt(Adapter, (UINT)0x0F007094, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 			}
 				uiResetValue = 0x01020101;
 				retval = wrmalt(Adapter, (UINT)0x0F00701c, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 			}
 				uiResetValue = 0x01010000;
 				retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 			}
@@ -990,70 +989,70 @@ int ddr_init(struct bcm_mini_adapter *Adapter)
 		 * and since we dont have internal PMU lets do it under UMA-B chip id.
 	     * we will change this when we will have internal PMU.
 	     */
-		if(Adapter->PmuMode == HYBRID_MODE_7C) {
+		if (Adapter->PmuMode == HYBRID_MODE_7C) {
 			retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x1322a8;
 			retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x132296;
 			retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
-			if(retval < 0) {
+			if (retval < 0) {
 				BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 				return retval;
 			}
-		} else if(Adapter->PmuMode == HYBRID_MODE_6 ) {
+		} else if (Adapter->PmuMode == HYBRID_MODE_6) {
 
 				retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
 				retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
 				uiResetValue = 0x6003229a;
 				retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
 				retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
 				retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
 				uiResetValue = 0x1322a8;
 				retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
+				if (retval < 0) {
 					BCM_DEBUG_PRINT(Adapter, CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__);
 					return retval;
 				}
@@ -1126,12 +1125,12 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
 			psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
 			break;
 
-			case DDR_160_MHZ:
-				bOverrideSelfRefresh = TRUE;
-				psDDRSetting = asT3LPB_DDRSetting160MHz;
-				RegCount = ARRAY_SIZE(asT3LPB_DDRSetting160MHz);
-				RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
-				psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
+		case DDR_160_MHZ:
+			bOverrideSelfRefresh = TRUE;
+			psDDRSetting = asT3LPB_DDRSetting160MHz;
+			RegCount = ARRAY_SIZE(asT3LPB_DDRSetting160MHz);
+			RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
+			psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
 
 				break;
 			default:
@@ -1193,7 +1192,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
 	//total number of Register that has to be dumped
 	value = RegCount  ;
 	retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value));
-	if(retval) {
+	if (retval) {
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__);
 
 		return retval;
@@ -1202,7 +1201,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
 	/*signature */
 	value = (0x1d1e0dd0);
 	retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value));
-	if(retval) {
+	if (retval) {
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__);
 		return retval;
 	}
@@ -1210,14 +1209,14 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
 	ul_ddr_setting_load_addr += sizeof(ULONG);
 	RegCount *= (sizeof(struct bcm_ddr_setting)/sizeof(ULONG));
 
-	while(RegCount && !retval) {
+	while (RegCount && !retval) {
 		value = psDDRSetting->ulRegAddress ;
-		retval = wrmalt( Adapter, ul_ddr_setting_load_addr, &value, sizeof(value));
+		retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value));
 		ul_ddr_setting_load_addr += sizeof(ULONG);
-		if(!retval) {
-			if(bOverrideSelfRefresh && (psDDRSetting->ulRegAddress == 0x0F007018)) {
+		if (!retval) {
+			if (bOverrideSelfRefresh && (psDDRSetting->ulRegAddress == 0x0F007018)) {
 				value = (psDDRSetting->ulRegValue | (1<<8));
-				if(STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr,
+				if (STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr,
 					&value, sizeof(value))) { 
 					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__);
 					break;
@@ -1225,7 +1224,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
 			} else {
 					value =  psDDRSetting->ulRegValue;
 
-					if(STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr ,
+					if (STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr ,
 						&value, sizeof(value))) {
 						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__);
 						break;
-- 
1.8.4



More information about the devel mailing list