EDAC: remove an unneeded condition in i5100_init_csrows()

PATCH Applied Dan Carpenter 2 participants 2 messages Feb 13, 2014 – Feb 20, 2014

Subsystems (2)

Kernel janitors EDAC-core

lore

Share & tools

lore

Dan Carpenter

author

2014-02-13 11:17 UTC #0 lore raw

PATCH 1/1 EDAC: remove an unneeded condition in i5100_init_csrows()

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 <[email protected]>

drivers/edac/i5100_edac.c +7 ~~-10~~

index 36a38ee94fa8..6247d186177e 100644
@@ -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));

Borislav Petkov

maintainer Applied

2014-02-20 10:56 UTC #1 lore raw

Quoted 4 lines · Dan Carpenter

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 <[email protected]>

Applied, thanks.

Signature · 5 lines

Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--