dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

memstick: remove mspro_block_mutex 

mspro_block_mutex is identical in scope to mspro_block_disk_lock and therefore
unnecessary.

Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alex Dubov 2011-01-12 17:01:04 -08:00 committed by Linus Torvalds
parent d8256d4878
commit edb50b3b1d
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/memstick/core/mspro_block.c
View File

@ -23,7 +23,6 @@
#define DRIVER_NAME "mspro_block"
static DEFINE_MUTEX(mspro_block_mutex);
static int major;
module_param(major, int, 0644);
@ -181,7 +180,6 @@ static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)
struct mspro_block_data *msb = disk->private_data;
int rc = -ENXIO;
mutex_lock(&mspro_block_mutex);
mutex_lock(&mspro_block_disk_lock);
if (msb && msb->card) {
@ -193,7 +191,6 @@ static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)
}
mutex_unlock(&mspro_block_disk_lock);
mutex_unlock(&mspro_block_mutex);
return rc;
}
@ -225,11 +222,7 @@ static int mspro_block_disk_release(struct gendisk *disk)
static int mspro_block_bd_release(struct gendisk *disk, fmode_t mode)
{
int ret;
mutex_lock(&mspro_block_mutex);
ret = mspro_block_disk_release(disk);
mutex_unlock(&mspro_block_mutex);
return ret;
return mspro_block_disk_release(disk);
}
static int mspro_block_bd_getgeo(struct block_device *bdev,