[v4,16/18] i2c: allow adapter drivers to override the adapter locking

Commit Message

Peter Rosin March 4, 2016, 9:33 a.m. UTC

Hi!

Here's a fixup for a problem found by the test robot. Sorry for the
inconvenience.

Cheers,
Peter

Patch

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 6be266c3d39b..5ecc6fc52ce0 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -961,6 +961,8 @@  static int i2c_check_addr_busy(struct i2c_adapter *adapter, int addr)
 /**
  * i2c_adapter_lock_bus - Get exclusive access to an I2C bus segment
  * @adapter: Target I2C bus segment
+ * @flags: I2C_LOCK_ADAPTER locks the root i2c adapter, I2C_LOCK_SEGMENT
+ *	locks only this branch in the adapter tree
  */
 static void i2c_adapter_lock_bus(struct i2c_adapter *adapter, int flags)
 {
@@ -970,6 +972,8 @@  static void i2c_adapter_lock_bus(struct i2c_adapter *adapter, int flags)
 /**
  * i2c_adapter_trylock_bus - Try to get exclusive access to an I2C bus segment
  * @adapter: Target I2C bus segment
+ * @flags: I2C_LOCK_ADAPTER trylocks the root i2c adapter, I2C_LOCK_SEGMENT
+ * 	trylocks only this branch in the adapter tree
  */
 static int i2c_adapter_trylock_bus(struct i2c_adapter *adapter, int flags)
 {
@@ -979,6 +983,8 @@  static int i2c_adapter_trylock_bus(struct i2c_adapter *adapter, int flags)
 /**
  * i2c_adapter_unlock_bus - Release exclusive access to an I2C bus segment
  * @adapter: Target I2C bus segment
+ * @flags: I2C_LOCK_ADAPTER unlocks the root i2c adapter, I2C_LOCK_SEGMENT
+ * 	unlocks only this branch in the adapter tree
  */
 static void i2c_adapter_unlock_bus(struct i2c_adapter *adapter, int flags)
 {