Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60c11d2a authored by Richard Holden's avatar Richard Holden Committed by Linus Torvalds
Browse files

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: default avatarRichard Holden <aciddeath@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3e680aae

drivers/telephony/phonedev.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ static int phone_open(struct inode *inode, struct file *file) 
	if (minor >= PHONE_NUM_DEVICES)

	if (minor >= PHONE_NUM_DEVICES)

		return -ENODEV;

		return -ENODEV;





	lock_kernel();

	mutex_lock(&phone_lock);

	mutex_lock(&phone_lock);

	p = phone_device[minor];

	p = phone_device[minor];

	if (p)

	if (p)
@@ -81,7 +80,6 @@ static int phone_open(struct inode *inode, struct file *file) 
	fops_put(old_fops);

	fops_put(old_fops);

end:

end:

	mutex_unlock(&phone_lock);

	mutex_unlock(&phone_lock);

	unlock_kernel();

	return err;

	return err;

}

}