leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: bcm: Lines shortened in download_ddr_settings()

Browse Source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-06-27 11:55:17 +02:00 committed by Greg Kroah-Hartman
parent 9d6f394505
commit 39874a0c75
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/bcm/DDRInit.c
View File

@ -1159,7 +1159,8 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
{ {
struct bcm_ddr_setting *psDDRSetting = NULL; struct bcm_ddr_setting *psDDRSetting = NULL;
ULONG RegCount = 0; ULONG RegCount = 0;
unsigned long ul_ddr_setting_load_addr = DDR_DUMP_INTERNAL_DEVICE_MEMORY; unsigned long ul_ddr_setting_load_addr =
DDR_DUMP_INTERNAL_DEVICE_MEMORY;
UINT value = 0; UINT value = 0;
int retval = STATUS_SUCCESS; int retval = STATUS_SUCCESS;
bool bOverrideSelfRefresh = false; bool bOverrideSelfRefresh = false;
@ -1283,18 +1284,22 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
} }
/* total number of Register that has to be dumped */ /* total number of Register that has to be dumped */
value = RegCount; value = RegCount;
retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value)); 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__); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
"%s:%d\n", __func__, __LINE__);
return retval; return retval;
} }
ul_ddr_setting_load_addr += sizeof(ULONG); ul_ddr_setting_load_addr += sizeof(ULONG);
/* signature */ /* signature */
value = (0x1d1e0dd0); value = (0x1d1e0dd0);
retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value)); 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__); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
"%s:%d\n", __func__, __LINE__);
return retval; return retval;
} }
@ -1303,17 +1308,23 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
while (RegCount && !retval) { while (RegCount && !retval) {
value = psDDRSetting->ulRegAddress; 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); ul_ddr_setting_load_addr += sizeof(ULONG);
if (!retval) { if (!retval) {
if (bOverrideSelfRefresh && (psDDRSetting->ulRegAddress == 0x0F007018)) if (bOverrideSelfRefresh
&& (psDDRSetting->ulRegAddress
== 0x0F007018))
value = (psDDRSetting->ulRegValue | (1<<8)); value = (psDDRSetting->ulRegValue | (1<<8));
else else
value = psDDRSetting->ulRegValue; value = psDDRSetting->ulRegValue;
if (STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr, if (STATUS_SUCCESS != wrmalt(Adapter,
&value, sizeof(value))) { ul_ddr_setting_load_addr,
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "%s:%d\n", __func__, __LINE__); &value,
sizeof(value))) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
"%s:%d\n", __func__, __LINE__);
break; break;
} }
} }