From 60c11d2abf4ef811d0ce3ea34279746729c4c6fc Mon Sep 17 00:00:00 2001 From: Richard Holden Date: Sat, 18 Oct 2008 20:27:53 -0700 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/telephony/phonedev.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/telephony') 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) if (minor >= PHONE_NUM_DEVICES) return -ENODEV; - lock_kernel(); mutex_lock(&phone_lock); p = phone_device[minor]; if (p) @@ -81,7 +80,6 @@ static int phone_open(struct inode *inode, struct file *file) fops_put(old_fops); end: mutex_unlock(&phone_lock); - unlock_kernel(); return err; } -- cgit v1.2.1