Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ff0a268 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Clean up header files included in the core 



This patch addresses the following issues in the header files in the
cpufreq core:
 - Include headers in ascending order, so that we don't add same
   many times by mistake.
 - <asm/> must be included after <linux/>, so that they override
   whatever they need to.
 - Remove unnecessary includes.
 - Don't include files already included by cpufreq.h or
   cpufreq_governor.h.

[rjw: Changelog]
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1133bfa6

drivers/cpufreq/cpufreq.c

+6 −13
Original line number Diff line number Diff line
@@ -17,24 +17,17 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <asm/cputime.h>

#include <linux/kernel.h>

#include <linux/kernel_stat.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/cpufreq.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/spinlock.h>

#include <linux/tick.h>

#include <linux/device.h>

#include <linux/slab.h>

#include <linux/cpu.h>

#include <linux/completion.h>

#include <linux/init.h>

#include <linux/kernel_stat.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/syscore_ops.h>



#include <linux/tick.h>

#include <trace/events/power.h>



/**

drivers/cpufreq/cpufreq_conservative.c

+0 −12
Original line number Diff line number Diff line
@@ -11,19 +11,7 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/cpufreq.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/kernel_stat.h>

#include <linux/kobject.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/notifier.h>

#include <linux/percpu-defs.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/types.h>



#include "cpufreq_governor.h"



/* Conservative governor macros */

drivers/cpufreq/cpufreq_governor.c

+0 −6
Original line number Diff line number Diff line
@@ -16,15 +16,9 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <asm/cputime.h>

#include <linux/cpufreq.h>

#include <linux/cpumask.h>

#include <linux/export.h>

#include <linux/kernel_stat.h>

#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/types.h>

#include <linux/workqueue.h>



#include "cpufreq_governor.h"

drivers/cpufreq/cpufreq_governor.h

+2 −3
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 
#define _CPUFREQ_GOVERNOR_H



#include <linux/cpufreq.h>

#include <linux/kobject.h>

#include <linux/kernel_stat.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/workqueue.h>

#include <linux/sysfs.h>



/*

 * The polling frequency depends on the capability of the processor. Default

drivers/cpufreq/cpufreq_ondemand.c

+1 −11
Original line number Diff line number Diff line
@@ -12,20 +12,10 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/cpufreq.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/kernel_stat.h>

#include <linux/kobject.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/cpu.h>

#include <linux/percpu-defs.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/tick.h>

#include <linux/types.h>

#include <linux/cpu.h>



#include "cpufreq_governor.h"



/* On-demand governor macros */