mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -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
|
|
@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct file * file,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int eisa_eeprom_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
return -ENOTTY;
|
||||
}
|
||||
|
||||
static int eisa_eeprom_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
cycle_kernel_lock();
|
||||
|
||||
if (file->f_mode & FMODE_WRITE)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
@ -104,7 +95,6 @@ static const struct file_operations eisa_eeprom_fops = {
|
|||
.owner = THIS_MODULE,
|
||||
.llseek = eisa_eeprom_llseek,
|
||||
.read = eisa_eeprom_read,
|
||||
.ioctl = eisa_eeprom_ioctl,
|
||||
.open = eisa_eeprom_open,
|
||||
.release = eisa_eeprom_release,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue