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

Commit 2760984f authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

cpufreq: delete __cpuinit usage from all cpufreq files 

The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications.  For example, the fix in
commit 5e427ec2 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.

After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out.  Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.

This removes all the drivers/cpufreq uses of the __cpuinit macros
from all C files.

[1] https://lkml.org/lkml/2013/5/20/589



[v2: leave 2nd lines of args misaligned as requested by Viresh]
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Acked-by: default avatarDirk Brandewie <dirk.j.brandewie@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 8c37bb3a

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -1932,7 +1932,7 @@ int cpufreq_update_policy(unsigned int cpu) 
}

EXPORT_SYMBOL(cpufreq_update_policy);



static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,

static int cpufreq_cpu_callback(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;

drivers/cpufreq/cpufreq_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb, 
	return 0;

}



static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,

static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,

					       unsigned long action,

					       void *hcpu)

{

drivers/cpufreq/dbx500-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu) 
	return freq_table[i].frequency;

}



static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)

static int dbx500_cpufreq_init(struct cpufreq_policy *policy)

{

	int res;

drivers/cpufreq/intel_pstate.c

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy) 
	return 0;

}



static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)

static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)

{

	int cpu = policy->cpu;
@@ -627,7 +627,7 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy) 
	return 0;

}



static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)

static int intel_pstate_cpu_init(struct cpufreq_policy *policy)

{

	int rc, min_pstate, max_pstate;

	struct cpudata *cpu;

drivers/cpufreq/longhaul.c

+3 −3
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int guess_fsb(int mult) 
}





static int __cpuinit longhaul_get_ranges(void)

static int longhaul_get_ranges(void)

{

	unsigned int i, j, k = 0;

	unsigned int ratio;
@@ -526,7 +526,7 @@ static int __cpuinit longhaul_get_ranges(void) 
}





static void __cpuinit longhaul_setup_voltagescaling(void)

static void longhaul_setup_voltagescaling(void)

{

	union msr_longhaul longhaul;

	struct mV_pos minvid, maxvid, vid;
@@ -780,7 +780,7 @@ static int longhaul_setup_southbridge(void) 
	return 0;

}



static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)

static int longhaul_cpu_init(struct cpufreq_policy *policy)

{

	struct cpuinfo_x86 *c = &cpu_data(0);

	char *cpuname = NULL;