aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/rocket_int.h
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias.kaehlcke@gmail.com>2007-05-08 03:32:00 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:15 -0400
commit69f545ea6aa9cf0a1b2e31b287e17f4cd9eb6d93 (patch)
tree14ffae34a61890a9cb652e316a3735074515049b /drivers/char/rocket_int.h
parent6bdb6b620e335d38ced8d5981e8f44778225c1d8 (diff)
use mutex instead of semaphore in RocketPort driver
The RocketPort driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/rocket_int.h')
-rw-r--r--drivers/char/rocket_int.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 3a8bcc85bc14..89b4d7b10d12 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -15,6 +15,8 @@
15#define ROCKET_TYPE_MODEMIII 3 15#define ROCKET_TYPE_MODEMIII 3
16#define ROCKET_TYPE_PC104 4 16#define ROCKET_TYPE_PC104 4
17 17
18#include <linux/mutex.h>
19
18#include <asm/io.h> 20#include <asm/io.h>
19#include <asm/byteorder.h> 21#include <asm/byteorder.h>
20 22
@@ -1171,7 +1173,7 @@ struct r_port {
1171 struct wait_queue *close_wait; 1173 struct wait_queue *close_wait;
1172#endif 1174#endif
1173 spinlock_t slock; 1175 spinlock_t slock;
1174 struct semaphore write_sem; 1176 struct mutex write_mtx;
1175}; 1177};
1176 1178
1177#define RPORT_MAGIC 0x525001 1179#define RPORT_MAGIC 0x525001