From: Mauro Carvalho Chehab Date: Wed, 28 Mar 2012 23:13:36 +0000 (-0300) Subject: i82975x_edac: Test nr_pages earlier to save a few CPU cycles X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=36683aab90373afd0cff0935bf886ebe6c7b0de6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git i82975x_edac: Test nr_pages earlier to save a few CPU cycles Avoid test nr_pages twice, and initializing some data that won't be used. Cleanup patch only. Reported-by: Aristeu Rozanski Filho Reviewed-by: Aristeu Rozanski Cc: Ranganathan Desikan Cc: "Arvind R." Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 9c346d7f707f..433332c7cdba 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c @@ -410,6 +410,9 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci, cumul_size); nr_pages = cumul_size - last_cumul_size; + if (!nr_pages) + continue; + /* * Initialise dram labels * index values: @@ -420,9 +423,6 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci, for (chan = 0; chan < csrow->nr_channels; chan++) { dimm = mci->csrows[index].channels[chan].dimm; - if (!nr_pages) - continue; - dimm->nr_pages = nr_pages / csrow->nr_channels; strncpy(csrow->channels[chan].dimm->label, labels[(index >> 1) + (chan * 2)], @@ -433,9 +433,6 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci, dimm->edac_mode = EDAC_SECDED; /* only supported */ } - if (!nr_pages) - continue; /* not populated */ - csrow->first_page = last_cumul_size; csrow->last_page = cumul_size - 1; last_cumul_size = cumul_size;