| Message ID | 20191018103749.11226-1-sudeep.holla@arm.com |
|---|---|
| Headers | show |
| Series | cpufreq: merge arm big.LITTLE and vexpress-spc drivers | expand |
On 18-10-19, 11:37, Sudeep Holla wrote: > +static struct platform_driver ve_spc_cpufreq_platdrv = { > + .driver = { > + .name = "vexpress-spc-cpufreq", > + }, > + .probe = ve_spc_cpufreq_probe, > + .remove = ve_spc_cpufreq_remove, > +}; > +module_platform_driver(ve_spc_cpufreq_platdrv); > > MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>"); > -MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver"); > +MODULE_AUTHOR("Sudeep Holla <sudeep.holla@arm.com>"); > +MODULE_DESCRIPTION("Vexpress SPC ARM big LITTLE cpufreq driver"); > MODULE_LICENSE("GPL v2"); Strange. The -B option you used while generating the patch makes it fails to get applied om my side with am -3. git doesn't get the rename of file properly and shows me this conflict: static int ve_spc_init_opp_table(const struct cpumask *cpumask) { @@@ -68,4 -697,7 +727,11 @@@ static struct platform_driver ve_spc_cp }; module_platform_driver(ve_spc_cpufreq_platdrv); ++<<<<<<< HEAD +MODULE_LICENSE("GPL"); ++======= + MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>"); + MODULE_AUTHOR("Sudeep Holla <sudeep.holla@arm.com>"); + MODULE_DESCRIPTION("Vexpress SPC ARM big LITTLE cpufreq driver"); + MODULE_LICENSE("GPL v2"); ++>>>>>>> cpufreq: merge arm_big_little and vexpress-spc Can you resend this patch (only) without the -B option ? -- viresh
On 18-10-19, 11:37, Sudeep Holla wrote: > Hi, > > Since vexpress-spc is the sole user of arm_big_little cpufreq driver, > there's no point in keeping it separate anymore. I wanted to post these > patches for ages but kept postponing for no reason. > > Regards, > Sudeep > > v1->v2: > - generated the patch using -B that helps to keep delta short > for review > - Split the last patch into 3 different patches to deal with > removing bL_ops, debug messages and other code formatting > separately > > v2->v3: > - Added Nico's ack > - Added back blank lines and extra braces as suggested by Viresh > - Updated copyright year correctly Applied. Thanks. -- viresh
Hi, Since vexpress-spc is the sole user of arm_big_little cpufreq driver, there's no point in keeping it separate anymore. I wanted to post these patches for ages but kept postponing for no reason. Regards, Sudeep v1->v2: - generated the patch using -B that helps to keep delta short for review - Split the last patch into 3 different patches to deal with removing bL_ops, debug messages and other code formatting separately v2->v3: - Added Nico's ack - Added back blank lines and extra braces as suggested by Viresh - Updated copyright year correctly Sudeep Holla (5): cpufreq: scpi: remove stale/outdated comment about the driver cpufreq: merge arm_big_little and vexpress-spc cpufreq: vexpress-spc: drop unnessary cpufreq_arm_bL_ops abstraction cpufreq: vexpress-spc: remove lots of debug messages cpufreq: vexpress-spc: fix some coding style issues MAINTAINERS | 5 +- drivers/cpufreq/Kconfig.arm | 12 +- drivers/cpufreq/Makefile | 2 - drivers/cpufreq/arm_big_little.h | 43 --- drivers/cpufreq/scpi-cpufreq.c | 2 - ...rm_big_little.c => vexpress-spc-cpufreq.c} | 244 +++++++----------- 6 files changed, 92 insertions(+), 216 deletions(-) delete mode 100644 drivers/cpufreq/arm_big_little.h rename drivers/cpufreq/{arm_big_little.c => vexpress-spc-cpufreq.c} (68%) -- 2.17.1