On Tue, Nov 10, 2009 at 1:33 PM, Nathan Fontenot <nfont@xxxxxxxxxxxxxx> wrote: > Grant Likely wrote: >> >> Merge common code between PowerPC and MicroBlaze >> >> Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx> >> --- >> >> arch/microblaze/kernel/prom.c | 113 >> ---------------------------------------- >> arch/powerpc/kernel/prom.c | 114 >> ---------------------------------------- >> drivers/of/base.c | 116 >> +++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 116 insertions(+), 227 deletions(-) >> > > Should the prom_{add,remove,update}_property routines belong in base.c or > of_dynamic.c (patches coming soon for of_dynamic.c)? > My original patch set put these routines in of_dynamic.c and renamed > them to of_{add,remove,update}_property since they are part of the of > code. First stage for me is to go through the rather mechanical process of merging common code. As much as possible I'm not changing any APIs, and I don't have enough background on the of_dynamic stuff to make a call about where it should ultimately live. The goal of the first stage is simply to eliminate duplicated code. Rename of functions to of_ is potentially risky, so I'm deferring those changes until after all the code is merged. Feel free to make changes on top of what I'm doing. Keep each one small to reduce the risk of conflict. I'll pick up the ones that make sense. Cheers, g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html