lkml.org 
[lkml]   [2012]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/14] i7300_edac: Get rid of some wrongly-solved rebase conflict
    Date
    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


    \
     
     \ /
      Last update: 2012-03-29 19:09    [W:0.026 / U:0.492 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site