From patchwork Thu Aug 25 23:43:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 1099712 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7PNooXq004632 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 25 Aug 2011 23:51:11 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qwjfx-0004SU-Ov; Thu, 25 Aug 2011 23:49:34 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qwje4-0003HV-G6; Thu, 25 Aug 2011 23:47:36 +0000 Received: from avon.wwwdotorg.org ([2001:470:1f0f:bd7::2]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qwjaw-0002V4-He for linux-arm-kernel@lists.infradead.org; Thu, 25 Aug 2011 23:44:24 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 4DE9D63F8; Thu, 25 Aug 2011 17:46:05 -0600 (MDT) Received: from localhost.localdomain (searspoint.nvidia.com [216.228.112.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 1A2D9E45FB; Thu, 25 Aug 2011 17:44:18 -0600 (MDT) From: Stephen Warren To: Grant Likely , Colin Cross , Erik Gilling , Olof Johansson Subject: [PATCH v3 11/13] of: add property iteration helpers Date: Thu, 25 Aug 2011 17:43:42 -0600 Message-Id: <1314315824-9687-12-git-send-email-swarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1314315824-9687-1-git-send-email-swarren@nvidia.com> References: <1314315824-9687-1-git-send-email-swarren@nvidia.com> X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110825_194422_882465_FC15BB49 X-CRM114-Status: GOOD ( 17.77 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Cc: Russell King , Sergei Shtylyov , Arnd Bergmann , Stephen Warren , Belisko Marek , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Shawn Guo , linux-tegra@vger.kernel.org, Jamie Iles , Linus Walleij , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 25 Aug 2011 23:51:11 +0000 (UTC) This patch adds macros for_each_u32_property_value and for_each_string_property_value, which iterate over an array of values within a device-tree property. Usage is for example: struct of_iter_string_prop iter; for_each_string_property_value(iter, np, "pins") printk("Got value %s\n", iter.value); Signed-off-by: Stephen Warren Reviewed-by: Jamie Iles --- include/linux/of_iter_prop.h | 135 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) create mode 100644 include/linux/of_iter_prop.h diff --git a/include/linux/of_iter_prop.h b/include/linux/of_iter_prop.h new file mode 100644 index 0000000..c7fb2bf --- /dev/null +++ b/include/linux/of_iter_prop.h @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2011 NVIDIA Inc. + * + * Iterate over properties that store arrays. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef __OF_ITER_PROP_H__ +#define __OF_ITER_PROP_H__ + +#include + +#ifdef CONFIG_OF +struct of_iter_u32_prop { + const struct property *prop; + int len; + const __be32 *pvalue; + u32 value; +}; + +static inline void of_iter_u32_next(struct of_iter_u32_prop *iter) +{ + if (iter->len < 0) + return; + + iter->value = be32_to_cpup(iter->pvalue++); + iter->len--; +} + +static inline void of_iter_u32_init(struct of_iter_u32_prop *iter, + const struct device_node *np, + const char *name) +{ + iter->prop = of_find_property(np, name, &iter->len); + if (!iter->prop) { + iter->len = -1; + return; + } + + iter->pvalue = iter->prop->value; + if (!iter->pvalue) { + iter->len = -1; + return; + } + + iter->len /= sizeof(*iter->pvalue); + + of_iter_u32_next(iter); +} + +static inline bool of_iter_u32_test(struct of_iter_u32_prop *iter) +{ + return iter->len >= 0; +} + +#define for_each_u32_property_value(iter, np, prop_name) \ + for (of_iter_u32_init(&iter, np, prop_name); \ + of_iter_u32_test(&iter); \ + of_iter_u32_next(&iter)) + +struct of_iter_string_prop { + const struct property *prop; + int len; + const char *value; + const char *after; +}; + +static inline void of_iter_string_init(struct of_iter_string_prop *iter, + const struct device_node *np, + const char *name) +{ + iter->prop = of_find_property(np, name, &iter->len); + if (!iter->prop) { + iter->value = NULL; + return; + } + + iter->value = iter->prop->value; + if (!iter->value) + return; + + iter->after = iter->value + iter->len; +} + +static inline bool of_iter_string_test(struct of_iter_string_prop *iter) +{ + if (!iter->value) + return false; + + return iter->value < iter->after; +} + +static inline void of_iter_string_next(struct of_iter_string_prop *iter) +{ + int len; + + if (!iter->value) + return; + + len = strnlen(iter->value, iter->len); + iter->len -= len; + iter->value += len + 1; +} + +#define for_each_string_property_value(iter, np, prop_name) \ + for (of_iter_string_init(&iter, np, prop_name); \ + of_iter_string_test(&iter); \ + of_iter_string_next(&iter)) + +#else +struct of_iter_u32_prop { + u32 value; +}; + +#define for_each_u32_property_value(iter, np, prop_name) \ + while (0) + +struct of_iter_string_prop { + const char *value; +}; + +#define for_each_string_property_value(iter, np, prop_name) \ + while (0) + +#endif /* CONFIG_OF */ + +#endif /* __OF_ITER_PROP_H__ */