12 files changed, 3 insertions, 78 deletions

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 8126db0c8987..e2c5a94f683c 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -715,25 +715,6 @@ static inline u64 input_addr_to_sys_addr(struct mem_ctl_info *mci,
                                      input_addr_to_dram_addr(mci, input_addr));
 }
 
-/*
- * Find the minimum and maximum InputAddr values that map to the given @csrow.
- * Pass back these values in *input_addr_min and *input_addr_max.
- */
-static void find_csrow_limits(struct mem_ctl_info *mci, int csrow,
-                              u64 *input_addr_min, u64 *input_addr_max)
-{
-        struct amd64_pvt *pvt;
-        u64 base, mask;
-
-        pvt = mci->pvt_info;
-        BUG_ON((csrow < 0) || (csrow >= pvt->csels[0].b_cnt));
-
-        get_cs_base_and_mask(pvt, csrow, 0, &base, &mask);
-
-        *input_addr_min = base & ~mask;
-        *input_addr_max = base | mask;
-}
-
 /* Map the Error address to a PAGE and PAGE OFFSET. */
 static inline void error_address_to_page_and_offset(u64 error_address,
                                                     u32 *page, u32 *offset)
@@ -2185,7 +2166,7 @@ static int init_csrows(struct mem_ctl_info *mci)
 {
         struct csrow_info *csrow;
         struct amd64_pvt *pvt = mci->pvt_info;
-        u64 input_addr_min, input_addr_max, sys_addr, base, mask;
+        u64 base, mask;
         u32 val;
         int i, j, empty = 1;
         enum mem_type mtype;
@@ -2216,28 +2197,14 @@ static int init_csrows(struct mem_ctl_info *mci)
                         csrow->nr_pages = amd64_csrow_nr_pages(pvt, 0, i);
                 if (csrow_enabled(i, 1, pvt))
                         csrow->nr_pages += amd64_csrow_nr_pages(pvt, 1, i);
-                find_csrow_limits(mci, i, &input_addr_min, &input_addr_max);
-                sys_addr = input_addr_to_sys_addr(mci, input_addr_min);
-                csrow->first_page = (u32) (sys_addr >> PAGE_SHIFT);
-                sys_addr = input_addr_to_sys_addr(mci, input_addr_max);
-                csrow->last_page = (u32) (sys_addr >> PAGE_SHIFT);
 
                 get_cs_base_and_mask(pvt, i, 0, &base, &mask);
-                csrow->page_mask = ~mask;
                 /* 8 bytes of resolution */
 
                 mtype = amd64_determine_memory_type(pvt, i);
 
                 debugf1("  for MC node %d csrow %d:\n", pvt->mc_node_id, i);
-                debugf1("    input_addr_min: 0x%lx input_addr_max: 0x%lx\n",
-                        (unsigned long)input_addr_min,
-                        (unsigned long)input_addr_max);
-                debugf1("    sys_addr: 0x%lx  page_mask: 0x%lx\n",
-                        (unsigned long)sys_addr, csrow->page_mask);
-                debugf1("    nr_pages: %u  first_page: 0x%lx "
-                        "last_page: 0x%lx\n",
-                        (unsigned)csrow->nr_pages,
-                        csrow->first_page, csrow->last_page);
+                debugf1("    nr_pages: %u\n", csrow->nr_pages);
 
                 /*
                  * determine whether CHIPKILL or JUST ECC or NO ECC is operating
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index 6ae30176aef5..93c4d5a6a623 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -321,7 +321,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
         int rc;
         int i, j;
         struct mem_ctl_info *mci = NULL;
-        unsigned long last_page;
         u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL];
         bool stacked;
         void __iomem *window;
@@ -366,7 +365,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
          * cumulative; the last one will contain the total memory
          * contained in all ranks.
          */
-        last_page = -1UL;
         for (i = 0; i < mci->nr_csrows; i++) {
                 unsigned long nr_pages;
                 struct csrow_info *csrow = &mci->csrows[i];
@@ -378,9 +376,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
                 if (nr_pages == 0)
                         continue;
 
-                csrow->first_page = last_page + 1;
-                last_page += nr_pages;
-                csrow->last_page = last_page;
                 csrow->nr_pages = nr_pages;
 
                 for (j = 0; j < nr_channels; j++) {
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 95966ba9c5ca..26b40556958e 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1263,11 +1263,6 @@ static int i5000_init_csrows(struct mem_ctl_info *mci)
                 if (!MTR_DIMMS_PRESENT(mtr) && !MTR_DIMMS_PRESENT(mtr1))
                         continue;
 
-                /* FAKE OUT VALUES, FIXME */
-                p_csrow->first_page = 0 + csrow * 20;
-                p_csrow->last_page = 9 + csrow * 20;
-                p_csrow->page_mask = 0xFFF;
-
                 csrow_megs = 0;
                 for (channel = 0; channel < pvt->maxch; channel++) {
                         csrow_megs += pvt->dimm_info[csrow][channel].megabytes;
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 6c0dafa3f67b..5338c7968f78 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -859,8 +859,6 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
                  * FIXME: these two are totally bogus -- I don't see how to
                  * map them correctly to this structure...
                  */
-                mci->csrows[i].first_page = total_pages;
-                mci->csrows[i].last_page = total_pages + npages - 1;
                 mci->csrows[i].nr_pages = npages;
                 mci->csrows[i].csrow_idx = i;
                 mci->csrows[i].mci = mci;
diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index c2379ba95c5a..6f85dcb34019 100644
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -1180,11 +1180,6 @@ static int i5400_init_csrows(struct mem_ctl_info *mci)
                 if (!MTR_DIMMS_PRESENT(mtr))
                         continue;
 
-                /* FAKE OUT VALUES, FIXME */
-                p_csrow->first_page = 0 + csrow * 20;
-                p_csrow->last_page = 9 + csrow * 20;
-                p_csrow->page_mask = 0xFFF;
-
                 csrow_megs = 0;
                 for (channel = 0; channel < pvt->maxch; channel++) {
                         csrow_megs += pvt->dimm_info[csrow][channel].megabytes;
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index 4bfcb3da3f01..d4153d6cfe30 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -778,7 +778,7 @@ static int i7300_init_csrows(struct mem_ctl_info *mci)
         int rc = -ENODEV;
         int mtr;
         int ch, branch, slot, channel;
-        u32 last_page = 0, nr_pages;
+        u32 nr_pages;
         struct dimm_info *dimm;
 
         pvt = mci->pvt_info;
@@ -828,9 +828,6 @@ static int i7300_init_csrows(struct mem_ctl_info *mci)
 
                                 /* Update per_csrow memory count */
                                 p_csrow->nr_pages += nr_pages;
-                                p_csrow->first_page = last_page;
-                                last_page += nr_pages;
-                                p_csrow->last_page = last_page;
 
                                 rc = 0;
                         }
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 5449bd40a739..76c957c525fb 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -599,7 +599,6 @@ static int get_dimm_config(struct mem_ctl_info *mci)
         struct pci_dev *pdev;
         int i, j;
         int csrow = 0;
-        unsigned long last_page = 0;
         enum edac_type mode;
         enum mem_type mtype;
         struct dimm_info *dimm;
@@ -716,12 +715,8 @@ static int get_dimm_config(struct mem_ctl_info *mci)
                         npages = MiB_TO_PAGES(size);
 
                         csr = &mci->csrows[csrow];
-                        csr->first_page = last_page + 1;
-                        last_page += npages;
-                        csr->last_page = last_page;
                         csr->nr_pages = npages;
 
-                        csr->page_mask = 0;
                         csr->csrow_idx = csrow;
                         csr->nr_channels = 1;
 
diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 12d7fe04454c..d2e3c39ede9f 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -668,7 +668,6 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci,
         csrow = &mci->csrows[0];
         dimm = csrow->channels[0].dimm;
         csrow->nr_pages = pdata->total_mem >> PAGE_SHIFT;
-        csrow->last_page = csrow->first_page + csrow->nr_pages - 1;
         dimm->grain = 8;
 
         dimm->mtype = (ctl & MV64X60_SDRAM_REGISTERED) ? MEM_RDDR : MEM_DDR;
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index a75e56788b29..ec5e529e33f6 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -897,7 +897,6 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
         enum edac_type edac_mode;
         int row, j;
         u32 mbxcf, size;
-        static u32 ppc4xx_last_page;
 
         /* Establish the memory type and width */
 
@@ -959,10 +958,6 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
                         goto done;
                 }
 
-                csi->first_page = ppc4xx_last_page;
-                csi->last_page  = csi->first_page + csi->nr_pages - 1;
-                csi->page_mask  = 0;
-
                 /*
                  * It's unclear exactly what grain should be set to
                  * here. The SDRAM_ECCES register allows resolution of
@@ -984,8 +979,6 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
                         dimm->dtype     = dtype;
 
                         dimm->edac_mode = edac_mode;
-
-                ppc4xx_last_page += csi->nr_pages;
                 }
         }
 
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 21147ac38c4d..d5892c052bf4 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -642,8 +642,6 @@ static int get_dimm_config(struct mem_ctl_info *mci)
                                  * csrows.
                                  */
                                 csr = &mci->csrows[csrow];
-                                csr->first_page = last_page;
-                                csr->last_page = last_page + npages - 1;
                                 csr->nr_pages = npages;
                                 csr->csrow_idx = csrow;
                                 csr->nr_channels = 1;
diff --git a/drivers/edac/tile_edac.c b/drivers/edac/tile_edac.c
index c870f68ae8f1..54067c4b0cc1 100644
--- a/drivers/edac/tile_edac.c
+++ b/drivers/edac/tile_edac.c
@@ -110,9 +110,7 @@ static int __devinit tile_edac_init_csrows(struct mem_ctl_info *mci)
                 return -1;
         }
 
-        csrow->first_page = 0;
         csrow->nr_pages = mem_info.mem_size >> PAGE_SHIFT;
-        csrow->last_page = csrow->first_page + csrow->nr_pages - 1;
         dimm->grain = TILE_EDAC_ERROR_GRAIN;
         dimm->dtype = DEV_UNKNOWN;
 
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
index f7cc4d214949..bc7f880a4eed 100644
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
@@ -319,7 +319,6 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
         int rc;
         int i, j;
         struct mem_ctl_info *mci = NULL;
-        unsigned long last_page;
         u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL];
         bool stacked;
         void __iomem *window;
@@ -363,7 +362,6 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
          * cumulative; the last one will contain the total memory
          * contained in all ranks.
          */
-        last_page = -1UL;
         for (i = 0; i < mci->nr_csrows; i++) {
                 unsigned long nr_pages;
                 struct csrow_info *csrow = &mci->csrows[i];
@@ -375,9 +373,6 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
                 if (nr_pages == 0)
                         continue;
 
-                csrow->first_page = last_page + 1;
-                last_page += nr_pages;
-                csrow->last_page = last_page;
                 csrow->nr_pages = nr_pages;
 
                 for (j = 0; j < x38_channel_num; j++) {