diff options
| author | Arjan van de Ven <arjan@infradead.org> | 2006-01-12 18:43:35 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-12 18:43:35 +0000 |
| commit | a621aaed690b9439141c555941b6af53873f6ff1 (patch) | |
| tree | 47d08433a946e34299556a9e23482582ffb911c0 /drivers/mmc/mmc_block.c | |
| parent | 593195f9b2309693f27b402f34573f7920b82c3e (diff) | |
| download | linux-a621aaed690b9439141c555941b6af53873f6ff1.tar.bz2 | |
[MMC+MFD] Convert mmc to mutexes
convert mfd and mmc to mutexes
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/mmc_block.c')
| -rw-r--r-- | drivers/mmc/mmc_block.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index f2c42b13945d..9b7c37e0e574 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c @@ -28,6 +28,7 @@ #include <linux/kdev_t.h> #include <linux/blkdev.h> #include <linux/devfs_fs_kernel.h> +#include <linux/mutex.h> #include <linux/mmc/card.h> #include <linux/mmc/protocol.h> @@ -57,33 +58,33 @@ struct mmc_blk_data { unsigned int read_only; }; -static DECLARE_MUTEX(open_lock); +static DEFINE_MUTEX(open_lock); static struct mmc_blk_data *mmc_blk_get(struct gendisk *disk) { struct mmc_blk_data *md; - down(&open_lock); + mutex_lock(&open_lock); md = disk->private_data; if (md && md->usage == 0) md = NULL; if (md) md->usage++; - up(&open_lock); + mutex_unlock(&open_lock); return md; } static void mmc_blk_put(struct mmc_blk_data *md) { - down(&open_lock); + mutex_lock(&open_lock); md->usage--; if (md->usage == 0) { put_disk(md->disk); mmc_cleanup_queue(&md->queue); kfree(md); } - up(&open_lock); + mutex_unlock(&open_lock); } static int mmc_blk_open(struct inode *inode, struct file *filp) |