diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-02-07 03:49:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 03:49:14 -0500 |
commit | 3593cab5d62c4c7abced1076710f9bc2d8847433 (patch) | |
tree | dd5dc21961f6b4aef6900b0c2eb63ce7c70aecd5 /drivers/media/video/planb.c | |
parent | 538f9630afbbe429ecbcdcf92536200293a8e4b3 (diff) |
V4L/DVB (3318b): sem2mutex: drivers/media/, #2
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/planb.c')
-rw-r--r-- | drivers/media/video/planb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c index f3fc361bec97..15fd85acabda 100644 --- a/drivers/media/video/planb.c +++ b/drivers/media/video/planb.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <asm/pgtable.h> | 48 | #include <asm/pgtable.h> |
49 | #include <asm/page.h> | 49 | #include <asm/page.h> |
50 | #include <asm/irq.h> | 50 | #include <asm/irq.h> |
51 | #include <asm/semaphore.h> | 51 | #include <linux/mutex.h> |
52 | 52 | ||
53 | #include "planb.h" | 53 | #include "planb.h" |
54 | #include "saa7196.h" | 54 | #include "saa7196.h" |
@@ -329,12 +329,12 @@ static volatile struct dbdma_cmd *cmd_geo_setup( | |||
329 | 329 | ||
330 | static inline void planb_lock(struct planb *pb) | 330 | static inline void planb_lock(struct planb *pb) |
331 | { | 331 | { |
332 | down(&pb->lock); | 332 | mutex_lock(&pb->lock); |
333 | } | 333 | } |
334 | 334 | ||
335 | static inline void planb_unlock(struct planb *pb) | 335 | static inline void planb_unlock(struct planb *pb) |
336 | { | 336 | { |
337 | up(&pb->lock); | 337 | mutex_unlock(&pb->lock); |
338 | } | 338 | } |
339 | 339 | ||
340 | /***************/ | 340 | /***************/ |
@@ -2067,7 +2067,7 @@ static int init_planb(struct planb *pb) | |||
2067 | #endif | 2067 | #endif |
2068 | pb->tab_size = PLANB_MAXLINES + 40; | 2068 | pb->tab_size = PLANB_MAXLINES + 40; |
2069 | pb->suspend = 0; | 2069 | pb->suspend = 0; |
2070 | init_MUTEX(&pb->lock); | 2070 | mutex_init(&pb->lock); |
2071 | pb->ch1_cmd = 0; | 2071 | pb->ch1_cmd = 0; |
2072 | pb->ch2_cmd = 0; | 2072 | pb->ch2_cmd = 0; |
2073 | pb->mask = 0; | 2073 | pb->mask = 0; |