Messages in this thread | | | Subject | Re: [PATCH v3 02/10] EDAC/mc: Reorder functions edac_mc_alloc*() | From | Matthias Brugger <> | Date | Thu, 23 Jan 2020 20:02:00 +0100 |
| |
On 23/01/2020 10:02, Robert Richter wrote: > Reorder the new created functions edac_mc_alloc_csrows() and > edac_mc_alloc_dimms() and move them before edac_mc_alloc(). No further > code changes. > > Signed-off-by: Robert Richter <rrichter@marvell.com> > Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > Acked-by: Aristeu Rozanski <aris@redhat.com> > --- > drivers/edac/edac_mc.c | 209 ++++++++++++++++++++--------------------- > 1 file changed, 103 insertions(+), 106 deletions(-) > > diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c > index d71006a4f07b..1e227e69e216 100644 > --- a/drivers/edac/edac_mc.c > +++ b/drivers/edac/edac_mc.c > @@ -311,112 +311,6 @@ static void mci_release(struct device *dev) > kfree(mci); > } > > -static int edac_mc_alloc_csrows(struct mem_ctl_info *mci); > -static int edac_mc_alloc_dimms(struct mem_ctl_info *mci); > - > -struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > - unsigned int n_layers, > - struct edac_mc_layer *layers, > - unsigned int sz_pvt) > -{ [...] > - edac_dbg(1, "allocating %u bytes for mci data (%d %s, %d csrows/channels)\n", > - size, > - tot_dimms, > - per_rank ? "ranks" : "dimms", > - tot_csrows * tot_channels); > - > - mci = kzalloc(size, GFP_KERNEL); > - if (mci == NULL) > - return NULL; > - > - mci->dev.release = mci_release; > - device_initialize(&mci->dev);
Seems like some leftovers in your working tree. Are you sure you created the patches against a clean upstream tree?
Regards, Matthias
| |