Re: [PATCH] i2c-dev: Fix I2C_SLAVE ioctl comment

[Wolfram Sang]

On Fri, Sep 11, 2015 at 11:27:18AM +0200, Jean Delvare wrote:
> 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 
> Cc: Wolfram Sang 

Applied to for-next, thanks!



signature.asc
Description: Digital signature

[PATCH] i2c-dev: Fix I2C_SLAVE ioctl comment

[Jean Delvare]

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 
Cc: Wolfram Sang 
---
 drivers/i2c/i2c-dev.c |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

--- linux-4.2.orig/drivers/i2c/i2c-dev.c2015-09-11 11:22:00.962436523 
+0200
+++ linux-4.2/drivers/i2c/i2c-dev.c 2015-09-11 11:22:22.532879192 +0200
@@ -421,16 +421,6 @@ static long i2cdev_ioctl(struct file *fi
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 *fi
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


-- 
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html