[PATCH 1/2] i2c: Create for_each_i2c_adapter()

Sascha Hauer s.hauer at pengutronix.de
Wed Nov 11 08:05:00 PST 2015


This can be used by the i2c_probe command to iterate over i2c adapters.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 drivers/i2c/i2c.c | 8 ++++----
 include/i2c/i2c.h | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 52aaea8..9ed96da 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -42,7 +42,7 @@ struct boardinfo {
 };
 
 static LIST_HEAD(board_list);
-static LIST_HEAD(adapter_list);
+LIST_HEAD(i2c_adapter_list);
 
 /**
  * i2c_transfer - execute a single or combined I2C message
@@ -529,7 +529,7 @@ struct i2c_adapter *i2c_get_adapter(int busnum)
 {
 	struct i2c_adapter *adap;
 
-	list_for_each_entry(adap, &adapter_list, list)
+	for_each_i2c_adapter(adap)
 		if (adap->nr == busnum)
 			return adap;
 	return NULL;
@@ -539,7 +539,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
 {
 	struct i2c_adapter *adap;
 
-	list_for_each_entry(adap, &adapter_list, list)
+	for_each_i2c_adapter(adap)
 		if (adap->dev.device_node == node)
 			return adap;
 
@@ -584,7 +584,7 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adapter)
 	if (ret)
 		return ret;
 
-	list_add_tail(&adapter->list, &adapter_list);
+	list_add_tail(&adapter->list, &i2c_adapter_list);
 
 	/* populate children from any i2c device tables */
 	scan_boardinfo(adapter);
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h
index 12e4827..3fab76d9 100644
--- a/include/i2c/i2c.h
+++ b/include/i2c/i2c.h
@@ -235,6 +235,10 @@ extern int i2c_add_numbered_adapter(struct i2c_adapter *adapter);
 struct i2c_adapter *i2c_get_adapter(int busnum);
 struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node);
 
+extern struct list_head i2c_adapter_list;
+#define for_each_i2c_adapter(adap) \
+	list_for_each_entry(adap, &i2c_adapter_list, list)
+
 /* For devices that use several addresses, use i2c_new_dummy() to make
  * client handles for the extra addresses.
  */
-- 
2.6.1




More information about the barebox mailing list