.. | .. |
---|
280 | 280 | return NULL; |
---|
281 | 281 | } |
---|
282 | 282 | |
---|
283 | | - window = ioremap_nocache(u.mchbar, I3200_MMR_WINDOW_SIZE); |
---|
| 283 | + window = ioremap(u.mchbar, I3200_MMR_WINDOW_SIZE); |
---|
284 | 284 | if (!window) |
---|
285 | 285 | printk(KERN_ERR "i3200: cannot map mmio space at 0x%llx\n", |
---|
286 | 286 | (unsigned long long)u.mchbar); |
---|
.. | .. |
---|
392 | 392 | unsigned long nr_pages; |
---|
393 | 393 | |
---|
394 | 394 | for (j = 0; j < nr_channels; j++) { |
---|
395 | | - struct dimm_info *dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, |
---|
396 | | - mci->n_layers, i, j, 0); |
---|
| 395 | + struct dimm_info *dimm = edac_get_dimm(mci, i, j, 0); |
---|
397 | 396 | |
---|
398 | 397 | nr_pages = drb_to_nr_pages(drbs, stacked, j, i); |
---|
399 | 398 | if (nr_pages == 0) |
---|