aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2011-02-21 13:43:02 -0500
committerBorislav Petkov <borislav.petkov@amd.com>2011-03-17 09:46:32 -0400
commit972ea17ab9116cca513a45526c93651d769fefc6 (patch)
tree793f97c57ee6ebf5877152a8df8cde7926903181
parent71d2a32e8e8411e160705aad88d26fb993a1faba (diff)
amd64_edac: Drop local variable
Use the macro directly instead Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
-rw-r--r--drivers/edac/amd64_edac.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 24253326a77c..9719f4aa1ad2 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1233,7 +1233,6 @@ static u64 f1x_get_norm_dct_addr(struct amd64_pvt *pvt, int range,
1233 u64 chan_off; 1233 u64 chan_off;
1234 u64 dram_base = get_dram_base(pvt, range); 1234 u64 dram_base = get_dram_base(pvt, range);
1235 u64 hole_off = f10_dhar_offset(pvt); 1235 u64 hole_off = f10_dhar_offset(pvt);
1236 u32 hole_valid = dhar_valid(pvt);
1237 u64 dct_sel_base_off = (pvt->dct_sel_hi & 0xFFFFFC00) << 16; 1236 u64 dct_sel_base_off = (pvt->dct_sel_hi & 0xFFFFFC00) << 16;
1238 1237
1239 if (hi_rng) { 1238 if (hi_rng) {
@@ -1250,7 +1249,7 @@ static u64 f1x_get_norm_dct_addr(struct amd64_pvt *pvt, int range,
1250 */ 1249 */
1251 if ((!(dct_sel_base_addr >> 16) || 1250 if ((!(dct_sel_base_addr >> 16) ||
1252 dct_sel_base_addr < dhar_base(pvt)) && 1251 dct_sel_base_addr < dhar_base(pvt)) &&
1253 hole_valid && 1252 dhar_valid(pvt) &&
1254 (sys_addr >= BIT_64(32))) 1253 (sys_addr >= BIT_64(32)))
1255 chan_off = hole_off; 1254 chan_off = hole_off;
1256 else 1255 else
@@ -1265,7 +1264,7 @@ static u64 f1x_get_norm_dct_addr(struct amd64_pvt *pvt, int range,
1265 * else 1264 * else
1266 * remove dram base to normalize to DCT address 1265 * remove dram base to normalize to DCT address
1267 */ 1266 */
1268 if (hole_valid && (sys_addr >= BIT_64(32))) 1267 if (dhar_valid(pvt) && (sys_addr >= BIT_64(32)))
1269 chan_off = hole_off; 1268 chan_off = hole_off;
1270 else 1269 else
1271 chan_off = dram_base; 1270 chan_off = dram_base;