From khali@linux-fr.org Sat Nov 26 19:24:56 2005 Date: Sat, 26 Nov 2005 20:58:35 +0100 From: Jean Delvare To: Greg KH Cc: Mauro Carvalho Chehab Subject: [PATCH 21/25] i2c: Rework client usage count, 1 of 3 Message-Id: <20051126205835.29f1b5e8.khali@linux-fr.org> Content-Disposition: inline; filename=i2c-client-use-01-drop-multiple-use-flag.patch No i2c client uses the I2C_CLIENT_ALLOW_MULTIPLE_USE flag, drop it. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/i2c-core.c | 4 +--- include/linux/i2c.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) --- gregkh-2.6.orig/drivers/i2c/i2c-core.c +++ gregkh-2.6/drivers/i2c/i2c-core.c @@ -500,9 +500,7 @@ int i2c_use_client(struct i2c_client *cl return ret; if (client->flags & I2C_CLIENT_ALLOW_USE) { - if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE) - client->usage_count++; - else if (client->usage_count > 0) + if (client->usage_count > 0) goto busy; else client->usage_count++; --- gregkh-2.6.orig/include/linux/i2c.h +++ gregkh-2.6/include/linux/i2c.h @@ -251,8 +251,6 @@ static inline void i2c_set_adapdata (str /*flags for the client struct: */ #define I2C_CLIENT_ALLOW_USE 0x01 /* Client allows access */ -#define I2C_CLIENT_ALLOW_MULTIPLE_USE 0x02 /* Allow multiple access-locks */ - /* on an i2c_client */ #define I2C_CLIENT_PEC 0x04 /* Use Packet Error Checking */ #define I2C_CLIENT_TEN 0x10 /* we have a ten bit chip address */ /* Must equal I2C_M_TEN below */