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

Commit 7f4bde9a authored Sep 06, 2005 by Adrian Bunk Committed by Linus Torvalds Sep 07, 2005

[PATCH] remove the second arg of do_timer_interrupt()



The second arg of do_timer_interrupt() is not used in the functions, and
all callers pass NULL.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Paul Mundt <lethal@Linux-SH.ORG>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 2832e936

arch/i386/kernel/time.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -252,8 +252,7 @@ EXPORT_SYMBOL(profile_pc);
	* timer_interrupt() needs to keep up the real-time clock,		* timer_interrupt() needs to keep up the real-time clock,
	* as well as call the "do_timer()" routine every clocktick		* as well as call the "do_timer()" routine every clocktick
	*/		*/
	static inline void do_timer_interrupt(int irq, void *dev_id,		static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
	struct pt_regs *regs)
	{		{
	#ifdef CONFIG_X86_IO_APIC		#ifdef CONFIG_X86_IO_APIC
	if (timer_ack) {		if (timer_ack) {
	@@ -307,7 +306,7 @@ irqreturn_t timer_interrupt(int irq, void dev_id, struct pt_regs regs)

	cur_timer->mark_offset();		cur_timer->mark_offset();

	do_timer_interrupt(irq, NULL, regs);		do_timer_interrupt(irq, regs);

	write_sequnlock(&xtime_lock);		write_sequnlock(&xtime_lock);
	return IRQ_HANDLED;		return IRQ_HANDLED;

arch/sh/kernel/time.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -234,7 +234,7 @@ static long last_rtc_update;
	* timer_interrupt() needs to keep up the real-time clock,		* timer_interrupt() needs to keep up the real-time clock,
	* as well as call the "do_timer()" routine every clocktick		* as well as call the "do_timer()" routine every clocktick
	*/		*/
	static inline void do_timer_interrupt(int irq, void dev_id, struct pt_regs regs)		static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
	{		{
	do_timer(regs);		do_timer(regs);
	#ifndef CONFIG_SMP		#ifndef CONFIG_SMP
	@@ -285,7 +285,7 @@ static irqreturn_t timer_interrupt(int irq, void dev_id, struct pt_regs regs)
	* locally disabled. -arca		* locally disabled. -arca
	*/		*/
	write_seqlock(&xtime_lock);		write_seqlock(&xtime_lock);
	do_timer_interrupt(irq, NULL, regs);		do_timer_interrupt(irq, regs);
	write_sequnlock(&xtime_lock);		write_sequnlock(&xtime_lock);

	return IRQ_HANDLED;		return IRQ_HANDLED;

arch/sh64/kernel/time.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -303,7 +303,7 @@ static long last_rtc_update = 0;
	* timer_interrupt() needs to keep up the real-time clock,		* timer_interrupt() needs to keep up the real-time clock,
	* as well as call the "do_timer()" routine every clocktick		* as well as call the "do_timer()" routine every clocktick
	*/		*/
	static inline void do_timer_interrupt(int irq, void dev_id, struct pt_regs regs)		static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
	{		{
	unsigned long long current_ctc;		unsigned long long current_ctc;
	asm ("getcon cr62, %0" : "=r" (current_ctc));		asm ("getcon cr62, %0" : "=r" (current_ctc));
	@@ -361,7 +361,7 @@ static irqreturn_t timer_interrupt(int irq, void dev_id, struct pt_regs regs)
	* locally disabled. -arca		* locally disabled. -arca
	*/		*/
	write_lock(&xtime_lock);		write_lock(&xtime_lock);
	do_timer_interrupt(irq, NULL, regs);		do_timer_interrupt(irq, regs);
	write_unlock(&xtime_lock);		write_unlock(&xtime_lock);

	return IRQ_HANDLED;		return IRQ_HANDLED;