aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-06-30 16:45:15 -0600
committerJonathan Corbet <corbet@lwn.net>2008-07-02 15:06:28 -0600
commit57debddaa1d247ed147209b22b5d40bd97526c33 (patch)
treed1bee647e2567fc188efc52ad19c92034eb147a4
parenta238b790d5f99c7832f9b73ac8847025815b85f7 (diff)
bf561-coreb: BKL unneeded for open()
According to Mike Frysinger: http://permalink.gmane.org/gmane.linux.kernel/699279 open() does not need the BKL, so take it back out.
-rw-r--r--arch/blackfin/mach-bf561/coreb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c
index 852647801a0..8598098c084 100644
--- a/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@ -32,7 +32,6 @@
#include <linux/device.h>
#include <linux/ioport.h>
#include <linux/module.h>
-#include <linux/smp_lock.h>
#include <linux/uaccess.h>
#include <linux/fs.h>
#include <asm/dma.h>
@@ -195,9 +194,9 @@ static loff_t coreb_lseek(struct file *file, loff_t offset, int origin)
return ret;
}
+/* No BKL needed here */
static int coreb_open(struct inode *inode, struct file *file)
{
- lock_kernel();
spin_lock_irq(&coreb_lock);
if (coreb_status & COREB_IS_OPEN)
@@ -206,12 +205,10 @@ static int coreb_open(struct inode *inode, struct file *file)
coreb_status |= COREB_IS_OPEN;
spin_unlock_irq(&coreb_lock);
- unlock_kernel();
return 0;
out_busy:
spin_unlock_irq(&coreb_lock);
- unlock_kernel();
return -EBUSY;
}