]> www.infradead.org Git - users/mchehab/edac.git/commitdiff
i7300_edac: Get rid of some wrongly-solved rebase conflict
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 29 Mar 2012 13:41:38 +0000 (10:41 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 17 May 2012 22:27:06 +0000 (19:27 -0300)
Drivers should not increment tot_dimms manually. This code were
there for an older approach that got removed. After one of the
several rebases that this code suffered until the final version,
the conflict was wrongly merged, and this code returned.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/edac/i7300_edac.c

index 381f7cd7d2a27c0656db425aa4c508f0b7649405..db84456e65d9844d750d0df8c710ac705307ed70 100644 (file)
@@ -803,9 +803,6 @@ static int i7300_init_csrows(struct mem_ctl_info *mci)
                                mtr = decode_mtr(pvt, slot, ch, branch,
                                                 dinfo, dimm);
 
-                               mci->tot_dimms++;
-                               dimm++;
-
                                /* if no DIMMS on this row, continue */
                                if (!MTR_DIMMS_PRESENT(mtr))
                                        continue;