Merge branch 'acpi-ec'

[linux-drm-fsl-dcu.git] / drivers / edac / i5100_edac.c

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 36a38ee94fa8a5236a27d9899b5c1481ac7fb981..e9f8a393915a82f54b3c7c63920ccf29244b8e17 100644 (file)
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -279,11 +279,6 @@ static inline u32 i5100_recmema_rank(u32 a)
        return i5100_nrecmema_rank(a);
 }
 
-static inline u32 i5100_recmema_dm_buf_id(u32 a)
-{
-       return i5100_nrecmema_dm_buf_id(a);
-}
-
 static inline u32 i5100_recmemb_cas(u32 a)
 {
        return i5100_nrecmemb_cas(a);
@@ -869,16 +864,13 @@ static void i5100_init_csrows(struct mem_ctl_info *mci)
                               chan, rank, 0);
 
                dimm->nr_pages = npages;
-               if (npages) {
-                       dimm->grain = 32;
-                       dimm->dtype = (priv->mtr[chan][rank].width == 4) ?
-                                       DEV_X4 : DEV_X8;
-                       dimm->mtype = MEM_RDDR2;
-                       dimm->edac_mode = EDAC_SECDED;
-                       snprintf(dimm->label, sizeof(dimm->label),
-                               "DIMM%u",
-                               i5100_rank_to_slot(mci, chan, rank));
-               }
+               dimm->grain = 32;
+               dimm->dtype = (priv->mtr[chan][rank].width == 4) ?
+                               DEV_X4 : DEV_X8;
+               dimm->mtype = MEM_RDDR2;
+               dimm->edac_mode = EDAC_SECDED;
+               snprintf(dimm->label, sizeof(dimm->label), "DIMM%u",
+                        i5100_rank_to_slot(mci, chan, rank));
 
                edac_dbg(2, "dimm channel %d, rank %d, size %ld\n",
                         chan, rank, (long)PAGES_TO_MiB(npages));