mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: agp: Remove the BKL from agp_open inifiband: Remove BKL from ipath_open() mips: Remove BKL from tb0219 drivers: Remove BKL from scx200_gpio drivers: Remove BKL from pc8736x_gpio parisc: Remove BKL from eisa_eeprom rtc: Remove BKL from efirtc input: Remove BKL from hp_sdc_rtc hw_random: Remove BKL from core macintosh: Remove BKL from ans-lcd nvram: Drop the bkl from non-generic nvram_llseek() nvram: Drop the bkl from nvram_llseek() mem_class: Drop the bkl from memory_open() spi: Remove BKL from spidev_open drivers: Remove BKL from cs5535_gpio drivers: Remove BKL from misc_open
This commit is contained in:
commit
18821b0408
16 changed files with 52 additions and 98 deletions
|
|
@ -30,7 +30,6 @@
|
|||
#include <linux/errno.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/smp_lock.h>
|
||||
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/spi/spidev.h>
|
||||
|
|
@ -477,7 +476,6 @@ static int spidev_open(struct inode *inode, struct file *filp)
|
|||
struct spidev_data *spidev;
|
||||
int status = -ENXIO;
|
||||
|
||||
lock_kernel();
|
||||
mutex_lock(&device_list_lock);
|
||||
|
||||
list_for_each_entry(spidev, &device_list, device_entry) {
|
||||
|
|
@ -503,7 +501,6 @@ static int spidev_open(struct inode *inode, struct file *filp)
|
|||
pr_debug("spidev: nothing for minor %d\n", iminor(inode));
|
||||
|
||||
mutex_unlock(&device_list_lock);
|
||||
unlock_kernel();
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue