Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb748fb2 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5d7b851d

drivers/i2c/i2c-core.c

+1 −3
Original line number Diff line number Diff line
@@ -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++;

include/linux/i2c.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */