[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>

2 files changed, 1 insertions, 5 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index ad68ac00d910..2f0bc9529376 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 3c16a8fb95f4..4487c5189747 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 */