aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/eisa_eeprom.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-10-10 09:33:17 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-10-14 11:36:52 -0400
commiteb29b758a8b0b2dbffd8dc898490237d3ee783e4 (patch)
tree2716683beefd06d4405547a1a33630cfb71dc3e9 /drivers/parisc/eisa_eeprom.c
parenta5ee6dc9ebe8fc2640ee3fbf2c340bd853e2fd36 (diff)
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>
Diffstat (limited to 'drivers/parisc/eisa_eeprom.c')
-rw-r--r--drivers/parisc/eisa_eeprom.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 8c0b26e9b98a..cce00ed81f37 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct file * file,
75 return ret; 75 return ret;
76} 76}
77 77
78static int eisa_eeprom_ioctl(struct inode *inode, struct file *file,
79 unsigned int cmd,
80 unsigned long arg)
81{
82 return -ENOTTY;
83}
84
85static int eisa_eeprom_open(struct inode *inode, struct file *file) 78static int eisa_eeprom_open(struct inode *inode, struct file *file)
86{ 79{
87 cycle_kernel_lock();
88
89 if (file->f_mode & FMODE_WRITE) 80 if (file->f_mode & FMODE_WRITE)
90 return -EINVAL; 81 return -EINVAL;
91 82
@@ -104,7 +95,6 @@ static const struct file_operations eisa_eeprom_fops = {
104 .owner = THIS_MODULE, 95 .owner = THIS_MODULE,
105 .llseek = eisa_eeprom_llseek, 96 .llseek = eisa_eeprom_llseek,
106 .read = eisa_eeprom_read, 97 .read = eisa_eeprom_read,
107 .ioctl = eisa_eeprom_ioctl,
108 .open = eisa_eeprom_open, 98 .open = eisa_eeprom_open,
109 .release = eisa_eeprom_release, 99 .release = eisa_eeprom_release,
110}; 100};