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

Commit ab8b3dbe authored by Amit Pundir's avatar Amit Pundir Committed by Stephen Boyd
Browse files

Revert "cpufreq: interactive: build fixes for 4.4" 



This reverts commit bc68f6c4efbd4ddbb15817203f18b7941d9ffd52.

This build fix broke the Interactive Gov at runtime with duplicate sysfs
entry warnings at boot time. We no longer need to this create/destroy
cpufreq sysfs entry at run time on need basis thanks to upstream commit
8eec1020 (cpufreq: create cpu/cpufreq at boot time) which creates it
at boot time. Hence drop this build fix.

Change-Id: I4b6ba122e1c55b74474e92c3a248b1e83f6dc8d1
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent bdfb4c33

drivers/cpufreq/cpufreq_interactive.c

+0 −22
Original line number Diff line number Diff line
@@ -162,28 +162,6 @@ struct cpufreq_interactive_tunables { 
	bool enable_prediction;

};



/*

 * HACK: FIXME: Bring back cpufreq_{get,put}_global_kobject()

 * definition removed by upstream commit 8eec1020f0c0 "cpufreq:

 * create cpu/cpufreq at boot time" to fix build failures.

 */

static int cpufreq_global_kobject_usage;



int cpufreq_get_global_kobject(void)

{

	if (!cpufreq_global_kobject_usage++)

		return kobject_add(cpufreq_global_kobject,

				&cpu_subsys.dev_root->kobj, "%s", "cpufreq");



	return 0;

}



void cpufreq_put_global_kobject(void)

{

	if (!--cpufreq_global_kobject_usage)

		kobject_del(cpufreq_global_kobject);

}



/* For cases where we have single governor instance for system */

static struct cpufreq_interactive_tunables *common_tunables;

static struct cpufreq_interactive_tunables *cached_common_tunables;