Messages in this thread Patch in this message | | | From | Mauro Carvalho Chehab <> | Subject | [PATCH 13/14] i7300_edac: Get rid of some wrongly-solved rebase conflict | Date | Thu, 29 Mar 2012 14:07:00 -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.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> --- drivers/edac/i7300_edac.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 57f264d..f9a4fa4 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -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; -- 1.7.8
| |