summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-10-10 15:33:17 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-10-14 17:36:52 +0200
commiteb29b758a8b0b2dbffd8dc898490237d3ee783e4 (patch)
tree2716683beefd06d4405547a1a33630cfb71dc3e9
parenta5ee6dc9ebe8fc2640ee3fbf2c340bd853e2fd36 (diff)
downloadop-kernel-dev-eb29b758a8b0b2dbffd8dc898490237d3ee783e4.zip
op-kernel-dev-eb29b758a8b0b2dbffd8dc898490237d3ee783e4.tar.gz
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>
-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 8c0b26e9..cce00ed 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,
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,
};
OpenPOWER on IntegriCloud