i2c-dev: Fix I2C_SLAVE ioctl comment
authorJean Delvare <jdelvare@suse.de>
Fri, 11 Sep 2015 09:27:18 +0000 (11:27 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 23 Oct 2015 21:26:44 +0000 (23:26 +0200)
The first part of the comment is wrong since November 2007, delete it.

The second part of the comment is related to I2C_PEC, not I2C_SLAVE, so
move it where it belongs.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/i2c-dev.c

index 38538971f4813ec9a37d11f5879247774e7f2b3a..2413ec9f8207eeffcfbeeb5480043e4651fdf15a 100644 (file)
@@ -421,16 +421,6 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        switch (cmd) {
        case I2C_SLAVE:
        case I2C_SLAVE_FORCE:
-               /* NOTE:  devices set up to work with "new style" drivers
-                * can't use I2C_SLAVE, even when the device node is not
-                * bound to a driver.  Only I2C_SLAVE_FORCE will work.
-                *
-                * Setting the PEC flag here won't affect kernel drivers,
-                * which will be using the i2c_client node registered with
-                * the driver model core.  Likewise, when that client has
-                * the PEC flag already set, the i2c-dev driver won't see
-                * (or use) this setting.
-                */
                if ((arg > 0x3ff) ||
                    (((client->flags & I2C_M_TEN) == 0) && arg > 0x7f))
                        return -EINVAL;
@@ -446,6 +436,13 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                        client->flags &= ~I2C_M_TEN;
                return 0;
        case I2C_PEC:
+               /*
+                * Setting the PEC flag here won't affect kernel drivers,
+                * which will be using the i2c_client node registered with
+                * the driver model core.  Likewise, when that client has
+                * the PEC flag already set, the i2c-dev driver won't see
+                * (or use) this setting.
+                */
                if (arg)
                        client->flags |= I2C_CLIENT_PEC;
                else