From 7d878c1320a1579d5110374215781fb9ba68070c Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 26 Nov 2005 20:58:35 +0100 Subject: [PATCH] --- yaml --- r: 16683 b: refs/heads/master c: cb748fb20186d4b345c68a7f580429f379fdd268 h: refs/heads/master i: 16681: cf5a05c9cb3595c0df2be57da04ddc64f0956695 16679: 80df7f6e2046337adae8ba51762e9720653269f5 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-core.c | 4 +--- trunk/include/linux/i2c.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3d6450830750..b9af4327c4a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d7b851dcced3611e4a4432308618b1ed1a9fc31 +refs/heads/master: cb748fb20186d4b345c68a7f580429f379fdd268 diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index ad68ac00d910..2f0bc9529376 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/drivers/i2c/i2c-core.c @@ -500,9 +500,7 @@ int i2c_use_client(struct i2c_client *client) 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++; diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h index 3c16a8fb95f4..4487c5189747 100644 --- a/trunk/include/linux/i2c.h +++ b/trunk/include/linux/i2c.h @@ -251,8 +251,6 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data) /*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 */