Re: [PATCH 2/3] cpufreq: merge arm_big_little and vexpress-spc

From: Sudeep Holla
Date: Thu Oct 17 2019 - 05:26:57 EST


On Thu, Oct 17, 2019 at 08:09:36AM +0530, Viresh Kumar wrote:
> On 16-10-19, 12:03, Sudeep Holla wrote:
> > arm_big_little cpufreq driver was designed as a generic big little
> > driver that could be used by any platform and make use of bL switcher.
> > Over years alternate solutions have be designed and merged to deal with
> > bL/HMP systems like EAS.
> >
> > Also since no other driver made use of generic arm_big_little cpufreq
> > driver except Vexpress SPC, we can merge them together as vexpress-spc
> > driver used only on Vexpress TC2(CA15_CA7) platform.
> >
> > Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
> > ---
> > MAINTAINERS | 5 +-
> > drivers/cpufreq/Kconfig.arm | 12 +-
> > drivers/cpufreq/Makefile | 2 -
> > drivers/cpufreq/arm_big_little.c | 658 ------------------------
> > drivers/cpufreq/arm_big_little.h | 43 --
> > drivers/cpufreq/vexpress-spc-cpufreq.c | 661 ++++++++++++++++++++++++-
> > 6 files changed, 652 insertions(+), 729 deletions(-)
> > delete mode 100644 drivers/cpufreq/arm_big_little.c
> > delete mode 100644 drivers/cpufreq/arm_big_little.h
>
> The delta produced here is enormous probably because you copy/pasted things. I
> am wondering if using git mv to rename arm_big_little.c and then move spc bits
> into it will make this delta smaller to review ?
>

Yes, I did a quick try but slightly different order. As I need the final
driver to be vexpress-spc-cpufreq.c, I am thinking of first merging
vexpress-spc-cpufreq.c into arm_big_little.c and then renaming it back
later. Does that sound good ?

drivers/cpufreq/arm_big_little.c | 78 ++++++++++++++++++++------
drivers/cpufreq/arm_big_little.h | 43 --------------
drivers/cpufreq/vexpress-spc-cpufreq.c | 71 -----------------------
6 files changed, 68 insertions(+), 145 deletions(-)
delete mode 100644 drivers/cpufreq/arm_big_little.h
delete mode 100644 drivers/cpufreq/vexpress-spc-cpufreq.c

If we first rename arm_big_little.c, then we need change the final name
otherwise we end up with same delta as the new name file will be merged
into vexpress-spc-cpufreq.c

--
Regards,
Sudeep