From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 27 Jun 2014 09:55:15 +0000 (+0200)
Subject: Staging: bcm: Moved doubled if-block
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40ee5a77eeae67247040719ec2f97bd75e164c87;p=linux-beck.git

Staging: bcm: Moved doubled if-block

This patch moves the doubled if block inside the retval-checking one
level up.

As the if-else-block it was in is now a one-statement if-else block,
I removed the braces from it.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index ac45ead10320..d2646d965211 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -1214,21 +1214,15 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
 		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 (bOverrideSelfRefresh && (psDDRSetting->ulRegAddress == 0x0F007018))
 				value = (psDDRSetting->ulRegValue | (1<<8));
-				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;
-				}
-			} else {
+			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;
-				}
+				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__);
+				break;
 			}
 		}
 		ul_ddr_setting_load_addr += sizeof(ULONG);