diff options
| author | Richard Holden <aciddeath@gmail.com> | 2008-10-18 23:27:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:36 -0400 |
| commit | 60c11d2abf4ef811d0ce3ea34279746729c4c6fc (patch) | |
| tree | 0e39f8a212461beb7195e46f7a727c9e820bbc2c /drivers/telephony | |
| parent | 3e680aae4e53ab54cdbb0c29257dae0cbb158e1c (diff) | |
phonedev: remove BKL
The phone_device array is covered by the phone_lock mutex in all cases and
request_module no longer needs the BKL so we can remove the only remaining
instance of the BKL from phonedev.
Signed-off-by: Richard Holden <aciddeath@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/telephony')
| -rw-r--r-- | drivers/telephony/phonedev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index 4d74ba36c3a1..37caf4d69037 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c | |||
| @@ -54,7 +54,6 @@ static int phone_open(struct inode *inode, struct file *file) | |||
| 54 | if (minor >= PHONE_NUM_DEVICES) | 54 | if (minor >= PHONE_NUM_DEVICES) |
| 55 | return -ENODEV; | 55 | return -ENODEV; |
| 56 | 56 | ||
| 57 | lock_kernel(); | ||
| 58 | mutex_lock(&phone_lock); | 57 | mutex_lock(&phone_lock); |
| 59 | p = phone_device[minor]; | 58 | p = phone_device[minor]; |
| 60 | if (p) | 59 | if (p) |
| @@ -81,7 +80,6 @@ static int phone_open(struct inode *inode, struct file *file) | |||
| 81 | fops_put(old_fops); | 80 | fops_put(old_fops); |
| 82 | end: | 81 | end: |
| 83 | mutex_unlock(&phone_lock); | 82 | mutex_unlock(&phone_lock); |
| 84 | unlock_kernel(); | ||
| 85 | return err; | 83 | return err; |
| 86 | } | 84 | } |
| 87 | 85 | ||
