diff options
author | Jonathan Corbet <corbet@lwn.net> | 2008-06-30 18:45:15 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 17:06:28 -0400 |
commit | 57debddaa1d247ed147209b22b5d40bd97526c33 (patch) | |
tree | d1bee647e2567fc188efc52ad19c92034eb147a4 | |
parent | a238b790d5f99c7832f9b73ac8847025815b85f7 (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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c index 852647801a01..8598098c0840 100644 --- a/arch/blackfin/mach-bf561/coreb.c +++ b/arch/blackfin/mach-bf561/coreb.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include <linux/smp_lock.h> | ||
36 | #include <linux/uaccess.h> | 35 | #include <linux/uaccess.h> |
37 | #include <linux/fs.h> | 36 | #include <linux/fs.h> |
38 | #include <asm/dma.h> | 37 | #include <asm/dma.h> |
@@ -195,9 +194,9 @@ static loff_t coreb_lseek(struct file *file, loff_t offset, int origin) | |||
195 | return ret; | 194 | return ret; |
196 | } | 195 | } |
197 | 196 | ||
197 | /* No BKL needed here */ | ||
198 | static int coreb_open(struct inode *inode, struct file *file) | 198 | static int coreb_open(struct inode *inode, struct file *file) |
199 | { | 199 | { |
200 | lock_kernel(); | ||
201 | spin_lock_irq(&coreb_lock); | 200 | spin_lock_irq(&coreb_lock); |
202 | 201 | ||
203 | if (coreb_status & COREB_IS_OPEN) | 202 | if (coreb_status & COREB_IS_OPEN) |
@@ -206,12 +205,10 @@ static int coreb_open(struct inode *inode, struct file *file) | |||
206 | coreb_status |= COREB_IS_OPEN; | 205 | coreb_status |= COREB_IS_OPEN; |
207 | 206 | ||
208 | spin_unlock_irq(&coreb_lock); | 207 | spin_unlock_irq(&coreb_lock); |
209 | unlock_kernel(); | ||
210 | return 0; | 208 | return 0; |
211 | 209 | ||
212 | out_busy: | 210 | out_busy: |
213 | spin_unlock_irq(&coreb_lock); | 211 | spin_unlock_irq(&coreb_lock); |
214 | unlock_kernel(); | ||
215 | return -EBUSY; | 212 | return -EBUSY; |
216 | } | 213 | } |
217 | 214 | ||