1 files changed, 5 insertions, 17 deletions

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index b8233ff863e3..d1bdf8abe5db 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -53,7 +53,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2o.h>
-#include <linux/smp_lock.h>
 
 #include <linux/mempool.h>
 
@@ -653,40 +652,30 @@ static int i2o_block_ioctl(struct block_device *bdev, fmode_t mode,
 {
         struct gendisk *disk = bdev->bd_disk;
         struct i2o_block_device *dev = disk->private_data;
-        int ret = -ENOTTY;
 
         /* Anyone capable of this syscall can do *real bad* things */
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        lock_kernel();
         switch (cmd) {
         case BLKI2OGRSTRAT:
-                ret = put_user(dev->rcache, (int __user *)arg);
-                break;
+                return put_user(dev->rcache, (int __user *)arg);
         case BLKI2OGWSTRAT:
-                ret = put_user(dev->wcache, (int __user *)arg);
-                break;
+                return put_user(dev->wcache, (int __user *)arg);
         case BLKI2OSRSTRAT:
-                ret = -EINVAL;
                 if (arg < 0 || arg > CACHE_SMARTFETCH)
-                        break;
+                        return -EINVAL;
                 dev->rcache = arg;
-                ret = 0;
                 break;
         case BLKI2OSWSTRAT:
-                ret = -EINVAL;
                 if (arg != 0
                     && (arg < CACHE_WRITETHROUGH || arg > CACHE_SMARTBACK))
-                        break;
+                        return -EINVAL;
                 dev->wcache = arg;
-                ret = 0;
                 break;
         }
-        unlock_kernel();
-
-        return ret;
+        return -ENOTTY;
 };
 
 /**
@@ -942,7 +931,6 @@ static const struct block_device_operations i2o_block_fops = {
         .open = i2o_block_open,
         .release = i2o_block_release,
         .ioctl = i2o_block_ioctl,
-        .compat_ioctl = i2o_block_ioctl,
         .getgeo = i2o_block_getgeo,
         .media_changed = i2o_block_media_changed
 };