[PATCH 3/6] drivers: base: Share implementations for dev_get_resource*()

[Andrey Smirnov <andrew.smirnov@xxxxxxxxx>]

Both dev_get_resource() and dev_get_resource_by_name() implement the
same algorithm and differ only in matching criteria. Move that
algoritm into a separate generic function and implement those two
functions using it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
---
 drivers/base/driver.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 22ca96d7e..4c1b6110a 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -325,14 +325,27 @@ int register_driver(struct driver_d *drv)
 }
 EXPORT_SYMBOL(register_driver);
 
-struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
-				  int num)
+static struct resource *
+dev_get_resource_by_name_or_id(struct device_d *dev, unsigned long type,
+			       const char *name, int num)
 {
 	int i, n = 0;
 
 	for (i = 0; i < dev->num_resources; i++) {
 		struct resource *res = &dev->resource[i];
-		if (resource_type(res) == type) {
+		if (resource_type(res) != type)
+			continue;
+
+		if (name) {
+			/*
+			 * If name is proveded we search using it
+			 */
+			if (res->name && !strcmp(name, res->name))
+				return res;
+		} else {
+			/*
+			 * Otherwise we match against provided id
+			 */
 			if (n == num)
 				return res;
 			n++;
@@ -342,6 +355,12 @@ struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
 	return ERR_PTR(-ENOENT);
 }
 
+struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
+				  int num)
+{
+	return dev_get_resource_by_name_or_id(dev, type, NULL, num);
+}
+
 void *dev_get_mem_region(struct device_d *dev, int num)
 {
 	struct resource *res;
@@ -358,19 +377,7 @@ struct resource *dev_get_resource_by_name(struct device_d *dev,
 					  unsigned long type,
 					  const char *name)
 {
-	int i;
-
-	for (i = 0; i < dev->num_resources; i++) {
-		struct resource *res = &dev->resource[i];
-		if (resource_type(res) != type)
-			continue;
-		if (!res->name)
-			continue;
-		if (!strcmp(name, res->name))
-			return res;
-	}
-
-	return ERR_PTR(-ENOENT);
+	return dev_get_resource_by_name_or_id(dev, type, name, -1);
 }
 
 void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *name)
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox