2009-10-10 15:39:29

by Thomas Gleixner

Subject: [patch 25/28] 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.

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Kyle McMartin <[email protected]>
---
drivers/parisc/eisa_eeprom.c | 10 ----------
1 file changed, 10 deletions(-)

Index: linux-2.6-tip/drivers/parisc/eisa_eeprom.c
===================================================================
--- linux-2.6-tip.orig/drivers/parisc/eisa_eeprom.c
+++ linux-2.6-tip/drivers/parisc/eisa_eeprom.c
@@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct f
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
.owner = THIS_MODULE,
.llseek = eisa_eeprom_llseek,
.read = eisa_eeprom_read,
- .ioctl = eisa_eeprom_ioctl,
.open = eisa_eeprom_open,
.release = eisa_eeprom_release,
};

2009-10-14 15:51:31

by Thomas Gleixner

Subject: [tip:bkl/drivers] parisc: Remove BKL from eisa_eeprom

Commit-ID: eb29b758a8b0b2dbffd8dc898490237d3ee783e4
Gitweb: http://git.kernel.org/tip/eb29b758a8b0b2dbffd8dc898490237d3ee783e4
Author: Thomas Gleixner <[email protected]>
AuthorDate: Sat, 10 Oct 2009 15:33:17 +0200
Committer: Thomas Gleixner <[email protected]>
CommitDate: Wed, 14 Oct 2009 17:36:52 +0200

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 <[email protected]>
LKML-Reference: <[email protected]>
Cc: Kyle McMartin <[email protected]>
---
drivers/parisc/eisa_eeprom.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 8c0b26e..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,
};

2009-10-14 17:36:33

by Kyle McMartin

Subject: Re: [patch 25/28] parisc: Remove BKL from eisa_eeprom

On Sat, Oct 10, 2009 at 03:37:26PM -0000, Thomas Gleixner wrote:
> 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.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Kyle McMartin <[email protected]>

Looks good to me.

Acked-by: Kyle McMartin <[email protected]>