Skip to content

Commit

Permalink
[PATCH] mutex subsystem, semaphore to completion: CPU3WDT
Browse files Browse the repository at this point in the history
change CPU3WDT semaphores to completions.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Jan 9, 2006
1 parent 906c3b7 commit 3fe0c27
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/char/watchdog/cpu5wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/timer.h>
#include <linux/completion.h>
#include <linux/jiffies.h>
#include <asm/io.h>
#include <asm/uaccess.h>
Expand Down Expand Up @@ -57,7 +58,7 @@ static int ticks = 10000;
/* some device data */

static struct {
struct semaphore stop;
struct completion stop;
volatile int running;
struct timer_list timer;
volatile int queue;
Expand Down Expand Up @@ -85,7 +86,7 @@ static void cpu5wdt_trigger(unsigned long unused)
}
else {
/* ticks doesn't matter anyway */
up(&cpu5wdt_device.stop);
complete(&cpu5wdt_device.stop);
}

}
Expand Down Expand Up @@ -239,7 +240,7 @@ static int __devinit cpu5wdt_init(void)
if ( !val )
printk(KERN_INFO PFX "sorry, was my fault\n");

init_MUTEX_LOCKED(&cpu5wdt_device.stop);
init_completion(&cpu5wdt_device.stop);
cpu5wdt_device.queue = 0;

clear_bit(0, &cpu5wdt_device.inuse);
Expand Down Expand Up @@ -269,7 +270,7 @@ static void __devexit cpu5wdt_exit(void)
{
if ( cpu5wdt_device.queue ) {
cpu5wdt_device.queue = 0;
down(&cpu5wdt_device.stop);
wait_for_completion(&cpu5wdt_device.stop);
}

misc_deregister(&cpu5wdt_misc);
Expand Down

0 comments on commit 3fe0c27

Please sign in to comment.