.. | .. |
---|
1134 | 1134 | u32 actual_tolm; |
---|
1135 | 1135 | u16 limit; |
---|
1136 | 1136 | int slot_row; |
---|
1137 | | - int maxch; |
---|
1138 | | - int maxdimmperch; |
---|
1139 | 1137 | int way0, way1; |
---|
1140 | 1138 | |
---|
1141 | 1139 | pvt = mci->pvt_info; |
---|
.. | .. |
---|
1144 | 1142 | &pvt->u.ambase_bottom); |
---|
1145 | 1143 | pci_read_config_dword(pvt->system_address, AMBASE + sizeof(u32), |
---|
1146 | 1144 | &pvt->u.ambase_top); |
---|
1147 | | - |
---|
1148 | | - maxdimmperch = pvt->maxdimmperch; |
---|
1149 | | - maxch = pvt->maxch; |
---|
1150 | 1145 | |
---|
1151 | 1146 | edac_dbg(2, "AMBASE= 0x%lx MAXCH= %d MAX-DIMM-Per-CH= %d\n", |
---|
1152 | 1147 | (long unsigned int)pvt->ambase, pvt->maxch, pvt->maxdimmperch); |
---|
.. | .. |
---|
1253 | 1248 | { |
---|
1254 | 1249 | struct i5000_pvt *pvt; |
---|
1255 | 1250 | struct dimm_info *dimm; |
---|
1256 | | - int empty, channel_count; |
---|
| 1251 | + int empty; |
---|
1257 | 1252 | int max_csrows; |
---|
1258 | 1253 | int mtr; |
---|
1259 | 1254 | int csrow_megs; |
---|
.. | .. |
---|
1261 | 1256 | int slot; |
---|
1262 | 1257 | |
---|
1263 | 1258 | pvt = mci->pvt_info; |
---|
1264 | | - |
---|
1265 | | - channel_count = pvt->maxch; |
---|
1266 | 1259 | max_csrows = pvt->maxdimmperch * 2; |
---|
1267 | 1260 | |
---|
1268 | 1261 | empty = 1; /* Assume NO memory */ |
---|
.. | .. |
---|
1282 | 1275 | if (!MTR_DIMMS_PRESENT(mtr)) |
---|
1283 | 1276 | continue; |
---|
1284 | 1277 | |
---|
1285 | | - dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers, |
---|
1286 | | - channel / MAX_BRANCHES, |
---|
1287 | | - channel % MAX_BRANCHES, slot); |
---|
| 1278 | + dimm = edac_get_dimm(mci, channel / MAX_BRANCHES, |
---|
| 1279 | + channel % MAX_BRANCHES, slot); |
---|
1288 | 1280 | |
---|
1289 | 1281 | csrow_megs = pvt->dimm_info[slot][channel].megabytes; |
---|
1290 | 1282 | dimm->grain = 8; |
---|
.. | .. |
---|
1559 | 1551 | |
---|
1560 | 1552 | edac_dbg(2, "MC:\n"); |
---|
1561 | 1553 | |
---|
1562 | | - /* Ensure that the OPSTATE is set correctly for POLL or NMI */ |
---|
1563 | | - opstate_init(); |
---|
| 1554 | + /* Ensure that the OPSTATE is set correctly for POLL or NMI */ |
---|
| 1555 | + opstate_init(); |
---|
1564 | 1556 | |
---|
1565 | 1557 | pci_rc = pci_register_driver(&i5000_driver); |
---|
1566 | 1558 | |
---|