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

Commit 48ac3271 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Dave Jones
Browse files

[CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR 



Looks like dbs_timer() is very careful wrt per_cpu(cpu_dbs_info),
and it doesn't need the help of WORK_STRUCT_NOAUTOREL.

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Acked-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent b077ffb3

drivers/cpufreq/cpufreq_ondemand.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -432,9 +432,6 @@ static void do_dbs_timer(struct work_struct *work) 
	/* We want all CPUs to do sampling nearly on same jiffy */

	/* We want all CPUs to do sampling nearly on same jiffy */

	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);

	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);





	/* Permit rescheduling of this work item */

	work_release(work);



	delay -= jiffies % delay;

	delay -= jiffies % delay;





	if (lock_policy_rwsem_write(cpu) < 0)

	if (lock_policy_rwsem_write(cpu) < 0)
@@ -473,7 +470,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) 
	dbs_info->enable = 1;

	dbs_info->enable = 1;

	ondemand_powersave_bias_init();

	ondemand_powersave_bias_init();

	dbs_info->sample_type = DBS_NORMAL_SAMPLE;

	dbs_info->sample_type = DBS_NORMAL_SAMPLE;

	INIT_DELAYED_WORK_NAR(&dbs_info->work, do_dbs_timer);

	INIT_DELAYED_WORK(&dbs_info->work, do_dbs_timer);

	queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,

	queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,

	                      delay);

	                      delay);

}

}