diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-11-26 20:58:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-05 22:16:22 -0800 |
| commit | cb748fb20186d4b345c68a7f580429f379fdd268 (patch) | |
| tree | 6c8f4f0937941bb4ee56ed72ba0b7f60562f1e1d | |
| parent | 5d7b851dcced3611e4a4432308618b1ed1a9fc31 (diff) | |
| download | kernel_samsung_tuna-cb748fb20186d4b345c68a7f580429f379fdd268.zip kernel_samsung_tuna-cb748fb20186d4b345c68a7f580429f379fdd268.tar.gz kernel_samsung_tuna-cb748fb20186d4b345c68a7f580429f379fdd268.tar.bz2 | |
[PATCH] i2c: Rework client usage count, 1 of 3
No i2c client uses the I2C_CLIENT_ALLOW_MULTIPLE_USE flag, drop it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 | ||||
| -rw-r--r-- | include/linux/i2c.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index ad68ac0..2f0bc95 100644 --- a/drivers/i2c/i2c-core.c +++ b/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/include/linux/i2c.h b/include/linux/i2c.h index 3c16a8f..4487c51 100644 --- a/include/linux/i2c.h +++ b/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 */ |