diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-10-20 13:53:03 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-10-24 11:25:55 -0400 |
| commit | a4e04571d60b58c0c778c870bc215bf467085fb6 (patch) | |
| tree | cff81d38b342965bcfb90b509cd1591a194bfdf2 /src/occ_405/lock | |
| parent | f5f808eb2918e96bcdf324bd2dd90853bf9b5f3c (diff) | |
| download | talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.tar.gz talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.zip | |
Changes for GCC 4.9 and OP
Change-Id: I95ddff4b290fcf3eab617a674afc489698c78a1e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31563
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/lock')
| -rwxr-xr-x | src/occ_405/lock/lock.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/occ_405/lock/lock.c b/src/occ_405/lock/lock.c index 0e75a93..51bed42 100755 --- a/src/occ_405/lock/lock.c +++ b/src/occ_405/lock/lock.c @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/occ_405/dimm/dimm.c $ */ +/* $Source: src/occ_405/lock/lock.c $ */ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* Contributors Listed Below - COPYRIGHT 2011,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -226,9 +226,6 @@ void occ_i2c_lock_release(const uint8_t i_engine) if ((PIB_I2C_ENGINE_ALL == i_engine) || (PIB_I2C_ENGINE_E == i_engine) || (PIB_I2C_ENGINE_D == i_engine) || (PIB_I2C_ENGINE_C == i_engine)) { - ocb_occflg_t occ_flags; - occ_flags.value = in32(OCB_OCCFLG); - if ((PIB_I2C_ENGINE_E == i_engine) || (PIB_I2C_ENGINE_ALL == i_engine)) { update_i2c_lock(LOCK_RELEASE, PIB_I2C_ENGINE_E); @@ -311,10 +308,8 @@ bool check_and_update_i2c_lock(const uint8_t i_engine) bool needRetry = false; do { - ocb_occflg_t occ_flags; ocb_occflg_t original_occflags; original_occflags.value = in32(OCB_OCCFLG); - occ_flags.value = original_occflags.value; LOCK_DBG("check_and_update_i2c_lock: I2C engine %d - host=%d, occ=%d (dimmTick=%d)", i_engine, original_occflags.fields.i2c_engine3_lock_host, original_occflags.fields.i2c_engine3_lock_occ, DIMM_TICK); |
