mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[PATCH] sem2mutex: misc static one-file mutexes
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 <[email protected]> Cc: Dave Jones <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Neil Brown <[email protected]> Acked-by: Alasdair G Kergon <[email protected]> Cc: Greg KH <[email protected]> Cc: Dominik Brodowski <[email protected]> Cc: Adam Belay <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: "David S. Miller" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
353ab6e97b
commit
14cc3e2b63
20 changed files with 172 additions and 157 deletions
|
|
@ -42,6 +42,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/isapnp.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#if 0
|
||||
|
|
@ -92,7 +93,7 @@ MODULE_LICENSE("GPL");
|
|||
#define _LTAG_FIXEDMEM32RANGE 0x86
|
||||
|
||||
static unsigned char isapnp_checksum_value;
|
||||
static DECLARE_MUTEX(isapnp_cfg_mutex);
|
||||
static DEFINE_MUTEX(isapnp_cfg_mutex);
|
||||
static int isapnp_detected;
|
||||
static int isapnp_csn_count;
|
||||
|
||||
|
|
@ -903,7 +904,7 @@ int isapnp_cfg_begin(int csn, int logdev)
|
|||
{
|
||||
if (csn < 1 || csn > isapnp_csn_count || logdev > 10)
|
||||
return -EINVAL;
|
||||
down(&isapnp_cfg_mutex);
|
||||
mutex_lock(&isapnp_cfg_mutex);
|
||||
isapnp_wait();
|
||||
isapnp_key();
|
||||
isapnp_wake(csn);
|
||||
|
|
@ -929,7 +930,7 @@ int isapnp_cfg_begin(int csn, int logdev)
|
|||
int isapnp_cfg_end(void)
|
||||
{
|
||||
isapnp_wait();
|
||||
up(&isapnp_cfg_mutex);
|
||||
mutex_unlock(&isapnp_cfg_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue