Commit eb29b758a8b0b2dbffd8dc898490237d3ee783e4
1 parent
a5ee6dc9eb
Exists in
master
and in
4 other branches
parisc: Remove BKL from eisa_eeprom
Remove the empty ioctl and the cycle_kernel_lock() in eisa_eeprom_open() which got there with the big BKL push down. There is nothing to wait for and sychronize with after the misc device has been registered. Remove the empty ioctl as well. The generic code handles the -ENOTTY if no ioctl function is provided. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <20091010153350.086917493@linutronix.de> Cc: Kyle McMartin <kyle@parisc-linux.org>
Showing 1 changed file with 0 additions and 10 deletions Side-by-side Diff
drivers/parisc/eisa_eeprom.c
| ... | ... | @@ -75,17 +75,8 @@ |
| 75 | 75 | return ret; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | -static int eisa_eeprom_ioctl(struct inode *inode, struct file *file, | |
| 79 | - unsigned int cmd, | |
| 80 | - unsigned long arg) | |
| 81 | -{ | |
| 82 | - return -ENOTTY; | |
| 83 | -} | |
| 84 | - | |
| 85 | 78 | static int eisa_eeprom_open(struct inode *inode, struct file *file) |
| 86 | 79 | { |
| 87 | - cycle_kernel_lock(); | |
| 88 | - | |
| 89 | 80 | if (file->f_mode & FMODE_WRITE) |
| 90 | 81 | return -EINVAL; |
| 91 | 82 | |
| ... | ... | @@ -104,7 +95,6 @@ |
| 104 | 95 | .owner = THIS_MODULE, |
| 105 | 96 | .llseek = eisa_eeprom_llseek, |
| 106 | 97 | .read = eisa_eeprom_read, |
| 107 | - .ioctl = eisa_eeprom_ioctl, | |
| 108 | 98 | .open = eisa_eeprom_open, |
| 109 | 99 | .release = eisa_eeprom_release, |
| 110 | 100 | }; |