1 files changed, 21 insertions, 19 deletions

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index d34c14c81c29..9d55c6383b23 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -34,6 +34,7 @@
 #include <linux/list.h>
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 static struct i2c_driver i2cdev_driver;
@@ -366,8 +367,7 @@ static noinline int i2cdev_ioctl_smbus(struct i2c_client *client,
         return res;
 }
 
-static int i2cdev_ioctl(struct inode *inode, struct file *file,
-                unsigned int cmd, unsigned long arg)
+static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         struct i2c_client *client = (struct i2c_client *)file->private_data;
         unsigned long funcs;
@@ -441,14 +441,20 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         struct i2c_client *client;
         struct i2c_adapter *adap;
         struct i2c_dev *i2c_dev;
+        int ret = 0;
 
+        lock_kernel();
         i2c_dev = i2c_dev_get_by_minor(minor);
-        if (!i2c_dev)
-                return -ENODEV;
+        if (!i2c_dev) {
+                ret = -ENODEV;
+                goto out;
+        }
 
         adap = i2c_get_adapter(i2c_dev->adap->nr);
-        if (!adap)
-                return -ENODEV;
+        if (!adap) {
+                ret = -ENODEV;
+                goto out;
+        }
 
         /* This creates an anonymous i2c_client, which may later be
          * pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE.
@@ -460,7 +466,8 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (!client) {
                 i2c_put_adapter(adap);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr);
         client->driver = &i2cdev_driver;
@@ -468,7 +475,9 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         client->adapter = adap;
         file->private_data = client;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int i2cdev_release(struct inode *inode, struct file *file)
@@ -487,7 +496,7 @@ static const struct file_operations i2cdev_fops = {
         .llseek         = no_llseek,
         .read           = i2cdev_read,
         .write          = i2cdev_write,
-        .ioctl          = i2cdev_ioctl,
+        .unlocked_ioctl = i2cdev_ioctl,
         .open           = i2cdev_open,
         .release        = i2cdev_release,
 };
@@ -512,9 +521,9 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
                 return PTR_ERR(i2c_dev);
 
         /* register this i2c device with the driver core */
-        i2c_dev->dev = device_create(i2c_dev_class, &adap->dev,
-                                     MKDEV(I2C_MAJOR, adap->nr),
-                                     "i2c-%d", adap->nr);
+        i2c_dev->dev = device_create_drvdata(i2c_dev_class, &adap->dev,
+                                             MKDEV(I2C_MAJOR, adap->nr),
+                                             NULL, "i2c-%d", adap->nr);
         if (IS_ERR(i2c_dev->dev)) {
                 res = PTR_ERR(i2c_dev->dev);
                 goto error;
@@ -549,19 +558,12 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
         return 0;
 }
 
-static int i2cdev_detach_client(struct i2c_client *client)
-{
-        return 0;
-}
-
 static struct i2c_driver i2cdev_driver = {
         .driver = {
                 .name   = "dev_driver",
         },
-        .id             = I2C_DRIVERID_I2CDEV,
         .attach_adapter = i2cdev_attach_adapter,
         .detach_adapter = i2cdev_detach_adapter,
-        .detach_client  = i2cdev_detach_client,
 };
 
 /* ------------------------------------------------------------------------- */