i5100_edac: Remove an unneeded condition in i5100_init_csrows()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 13 Feb 2014 11:17:38 +0000 (14:17 +0300)
committerBorislav Petkov <bp@suse.de>
Thu, 20 Feb 2014 10:52:58 +0000 (11:52 +0100)
We checked that "npages" was not zero a couple lines earlier so we can
remove this and pull the code in one indent level.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: http://lkml.kernel.org/r/20140213111738.GB15549@elgon.mountain
Signed-off-by: Borislav Petkov <bp@suse.de>
drivers/edac/i5100_edac.c

index 36a38ee94fa8a5236a27d9899b5c1481ac7fb981..6247d186177ed6c7ff4660c5644ae8d49a604ebd 100644 (file)
@@ -869,16 +869,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));