diff options
author | Jean Delvare <khali@linux-fr.org> | 2007-05-08 03:30:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:13 -0400 |
commit | b3561ea9462b33a0bf824b4ca19a1ae84db81210 (patch) | |
tree | 3d78d84fcc1bfd3d344d68550a2c0ee1e30631bd | |
parent | 97f067846786d255888ccad14e2f38a1f63d8e9b (diff) |
Clean up mutex_trylock noise
Ingo Molnar's semaphore to mutex conversions left some noise on a few
trylock calls. Clean it up.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/media/video/zoran_driver.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtd_blkdevs.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index 074323733352..cf0ed6cbb0e3 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
@@ -2034,7 +2034,7 @@ zoran_do_ioctl (struct inode *inode, | |||
2034 | * but moving the free code outside the munmap() handler fixes | 2034 | * but moving the free code outside the munmap() handler fixes |
2035 | * all this... If someone knows why, please explain me (Ronald) | 2035 | * all this... If someone knows why, please explain me (Ronald) |
2036 | */ | 2036 | */ |
2037 | if (!!mutex_trylock(&zr->resource_lock)) { | 2037 | if (mutex_trylock(&zr->resource_lock)) { |
2038 | /* we obtained it! Let's try to free some things */ | 2038 | /* we obtained it! Let's try to free some things */ |
2039 | if (fh->jpg_buffers.ready_to_be_freed) | 2039 | if (fh->jpg_buffers.ready_to_be_freed) |
2040 | jpg_fbuffer_free(file); | 2040 | jpg_fbuffer_free(file); |
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 524b83b5ebf5..51bc7e2f1f22 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c | |||
@@ -216,7 +216,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) | |||
216 | int last_devnum = -1; | 216 | int last_devnum = -1; |
217 | struct gendisk *gd; | 217 | struct gendisk *gd; |
218 | 218 | ||
219 | if (!!mutex_trylock(&mtd_table_mutex)) { | 219 | if (mutex_trylock(&mtd_table_mutex)) { |
220 | mutex_unlock(&mtd_table_mutex); | 220 | mutex_unlock(&mtd_table_mutex); |
221 | BUG(); | 221 | BUG(); |
222 | } | 222 | } |
@@ -294,7 +294,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) | |||
294 | 294 | ||
295 | int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old) | 295 | int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old) |
296 | { | 296 | { |
297 | if (!!mutex_trylock(&mtd_table_mutex)) { | 297 | if (mutex_trylock(&mtd_table_mutex)) { |
298 | mutex_unlock(&mtd_table_mutex); | 298 | mutex_unlock(&mtd_table_mutex); |
299 | BUG(); | 299 | BUG(); |
300 | } | 300 | } |