Commit 8fa7292f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

treewide: Switch/rename to timer_delete[_sync]() 



timer_delete[_sync]() replaces del_timer[_sync](). Convert the whole tree
over and remove the historical wrapper inlines.

Conversion was done with coccinelle plus manual fixups where necessary.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a8662bcd

arch/alpha/kernel/srmcons.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ srmcons_close(struct tty_struct *tty, struct file *filp) 


	if (tty->count == 1) {

		port->tty = NULL;

		del_timer(&srmconsp->timer);

		timer_delete(&srmconsp->timer);

	}



	spin_unlock_irqrestore(&port->lock, flags);

arch/arm/mach-footbridge/dc21285.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static struct timer_list perr_timer; 


static void dc21285_enable_error(struct timer_list *timer)

{

	del_timer(timer);

	timer_delete(timer);



	if (timer == &serr_timer)

		enable_irq(IRQ_PCI_SERR);

arch/arm/mach-pxa/sharpsl_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -913,8 +913,8 @@ static void sharpsl_pm_remove(struct platform_device *pdev) 
	if (sharpsl_pm.machinfo->exit)

		sharpsl_pm.machinfo->exit();



	del_timer_sync(&sharpsl_pm.chrg_full_timer);

	del_timer_sync(&sharpsl_pm.ac_timer);

	timer_delete_sync(&sharpsl_pm.chrg_full_timer);

	timer_delete_sync(&sharpsl_pm.ac_timer);

}



static struct platform_driver sharpsl_pm_driver = {

arch/m68k/amiga/amisound.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ void amiga_mksound( unsigned int hz, unsigned int ticks ) 
		return;



	local_irq_save(flags);

	del_timer( &sound_timer );

	timer_delete(&sound_timer);



	if (hz > 20 && hz < 32767) {

		unsigned long period = (clock_constant / hz);

arch/m68k/mac/macboing.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void mac_mksound( unsigned int freq, unsigned int length ) 


	local_irq_save(flags);



	del_timer( &mac_sound_timer );

	timer_delete(&mac_sound_timer);



	for ( i = 0; i < 0x800; i++ )

		mac_asc_regs[ i ] = 0;
@@ -277,7 +277,7 @@ static void mac_quadra_ring_bell(struct timer_list *unused) 


	local_irq_save(flags);



	del_timer( &mac_sound_timer );

	timer_delete(&mac_sound_timer);



	if ( mac_bell_duration-- > 0 )

	{