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

Commit 8d5e1d8e authored Jul 15, 2013 by Baruch Siach Committed by Chris Zankel Sep 06, 2013

xtensa: remove CCOUNT_PER_JIFFY



Use ccount_freq directly to make the code a little more readable.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>

parent fedc21dc

arch/xtensa/include/asm/timex.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,6 @@
	#endif		#endif

	extern unsigned long ccount_freq;		extern unsigned long ccount_freq;
	#define CCOUNT_PER_JIFFY (ccount_freq / HZ)

	typedef unsigned long long cycles_t;		typedef unsigned long long cycles_t;

arch/xtensa/kernel/setup.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -585,8 +585,8 @@ c_show(struct seq_file f, void slot)
	"bogomips\t: %lu.%02lu\n",		"bogomips\t: %lu.%02lu\n",
	XCHAL_BUILD_UNIQUE_ID,		XCHAL_BUILD_UNIQUE_ID,
	XCHAL_HAVE_BE ? "big" : "little",		XCHAL_HAVE_BE ? "big" : "little",
	CCOUNT_PER_JIFFY/(1000000/HZ),		ccount_freq/1000000,
	(CCOUNT_PER_JIFFY/(10000/HZ)) % 100,		(ccount_freq/10000) % 100,
	loops_per_jiffy/(500000/HZ),		loops_per_jiffy/(500000/HZ),
	(loops_per_jiffy/(5000/HZ)) % 100);		(loops_per_jiffy/(5000/HZ)) % 100);

arch/xtensa/kernel/time.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -130,7 +130,7 @@ void __init time_init(void)
	#else		#else
	ccount_freq = CONFIG_XTENSA_CPU_CLOCK*1000000UL;		ccount_freq = CONFIG_XTENSA_CPU_CLOCK*1000000UL;
	#endif		#endif
	clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ);		clocksource_register_hz(&ccount_clocksource, ccount_freq);

	ccount_timer.evt.cpumask = cpumask_of(0);		ccount_timer.evt.cpumask = cpumask_of(0);
	ccount_timer.evt.irq = irq_create_mapping(NULL, LINUX_TIMER_INT);		ccount_timer.evt.irq = irq_create_mapping(NULL, LINUX_TIMER_INT);
	@@ -164,7 +164,7 @@ irqreturn_t timer_interrupt (int irq, void *dev_id)
	#ifndef CONFIG_GENERIC_CALIBRATE_DELAY		#ifndef CONFIG_GENERIC_CALIBRATE_DELAY
	void calibrate_delay(void)		void calibrate_delay(void)
	{		{
	loops_per_jiffy = CCOUNT_PER_JIFFY;		loops_per_jiffy = ccount_freq / HZ;
	printk("Calibrating delay loop (skipped)... "		printk("Calibrating delay loop (skipped)... "
	"%lu.%02lu BogoMIPS preset\n",		"%lu.%02lu BogoMIPS preset\n",
	loops_per_jiffy/(1000000/HZ),		loops_per_jiffy/(1000000/HZ),