diff mbox

[U-Boot] image: Convert to use fdt_for_each_subnode macro

Message ID 1423211032.17538.2.camel@phoenix
State Changes Requested
Delegated to: Simon Glass
Headers show

Commit Message

Axel Lin Feb. 6, 2015, 8:23 a.m. UTC
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 common/image-fit.c |  4 +---
 common/image-sig.c | 16 ++++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

Comments

Simon Glass Feb. 6, 2015, 5:25 p.m. UTC | #1
Hi Axel,

On 6 February 2015 at 01:23, Axel Lin <axel.lin@ingics.com> wrote:
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Please can you add a commit message? The code looks fine.

> ---
>  common/image-fit.c |  4 +---
>  common/image-sig.c | 16 ++++------------
>  2 files changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/common/image-fit.c b/common/image-fit.c
> index b47d110..778d2a1 100644
> --- a/common/image-fit.c
> +++ b/common/image-fit.c
> @@ -1010,9 +1010,7 @@ int fit_image_verify(const void *fit, int image_noffset)
>         }
>
>         /* Process all hash subnodes of the component image node */
> -       for (noffset = fdt_first_subnode(fit, image_noffset);
> -            noffset >= 0;
> -            noffset = fdt_next_subnode(fit, noffset)) {
> +       fdt_for_each_subnode(fit, noffset, image_noffset) {
>                 const char *name = fit_get_name(fit, noffset, NULL);
>
>                 /*
> diff --git a/common/image-sig.c b/common/image-sig.c
> index 2c9f0cd..eda5e13 100644
> --- a/common/image-sig.c
> +++ b/common/image-sig.c
> @@ -212,9 +212,7 @@ static int fit_image_verify_sig(const void *fit, int image_noffset,
>         int ret;
>
>         /* Process all hash subnodes of the component image node */
> -       for (noffset = fdt_first_subnode(fit, image_noffset);
> -            noffset >= 0;
> -            noffset = fdt_next_subnode(fit, noffset)) {
> +       fdt_for_each_subnode(fit, noffset, image_noffset) {
>                 const char *name = fit_get_name(fit, noffset, NULL);
>
>                 if (!strncmp(name, FIT_SIG_NODENAME,
> @@ -262,9 +260,7 @@ int fit_image_verify_required_sigs(const void *fit, int image_noffset,
>                 return 0;
>         }
>
> -       for (noffset = fdt_first_subnode(sig_blob, sig_node);
> -            noffset >= 0;
> -            noffset = fdt_next_subnode(sig_blob, noffset)) {
> +       fdt_for_each_subnode(sig_blob, noffset, sig_node) {
>                 const char *required;
>                 int ret;
>
> @@ -397,9 +393,7 @@ static int fit_config_verify_sig(const void *fit, int conf_noffset,
>         int ret;
>
>         /* Process all hash subnodes of the component conf node */
> -       for (noffset = fdt_first_subnode(fit, conf_noffset);
> -            noffset >= 0;
> -            noffset = fdt_next_subnode(fit, noffset)) {
> +       fdt_for_each_subnode(fit, noffset, conf_noffset) {
>                 const char *name = fit_get_name(fit, noffset, NULL);
>
>                 if (!strncmp(name, FIT_SIG_NODENAME,
> @@ -444,9 +438,7 @@ int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
>                 return 0;
>         }
>
> -       for (noffset = fdt_first_subnode(sig_blob, sig_node);
> -            noffset >= 0;
> -            noffset = fdt_next_subnode(sig_blob, noffset)) {
> +       fdt_for_each_subnode(sig_blob, noffset, sig_node) {
>                 const char *required;
>                 int ret;
>
> --
> 1.9.1
>
>
>

Regards,
Simon
diff mbox

Patch

diff --git a/common/image-fit.c b/common/image-fit.c
index b47d110..778d2a1 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1010,9 +1010,7 @@  int fit_image_verify(const void *fit, int image_noffset)
 	}
 
 	/* Process all hash subnodes of the component image node */
-	for (noffset = fdt_first_subnode(fit, image_noffset);
-	     noffset >= 0;
-	     noffset = fdt_next_subnode(fit, noffset)) {
+	fdt_for_each_subnode(fit, noffset, image_noffset) {
 		const char *name = fit_get_name(fit, noffset, NULL);
 
 		/*
diff --git a/common/image-sig.c b/common/image-sig.c
index 2c9f0cd..eda5e13 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -212,9 +212,7 @@  static int fit_image_verify_sig(const void *fit, int image_noffset,
 	int ret;
 
 	/* Process all hash subnodes of the component image node */
-	for (noffset = fdt_first_subnode(fit, image_noffset);
-	     noffset >= 0;
-	     noffset = fdt_next_subnode(fit, noffset)) {
+	fdt_for_each_subnode(fit, noffset, image_noffset) {
 		const char *name = fit_get_name(fit, noffset, NULL);
 
 		if (!strncmp(name, FIT_SIG_NODENAME,
@@ -262,9 +260,7 @@  int fit_image_verify_required_sigs(const void *fit, int image_noffset,
 		return 0;
 	}
 
-	for (noffset = fdt_first_subnode(sig_blob, sig_node);
-	     noffset >= 0;
-	     noffset = fdt_next_subnode(sig_blob, noffset)) {
+	fdt_for_each_subnode(sig_blob, noffset, sig_node) {
 		const char *required;
 		int ret;
 
@@ -397,9 +393,7 @@  static int fit_config_verify_sig(const void *fit, int conf_noffset,
 	int ret;
 
 	/* Process all hash subnodes of the component conf node */
-	for (noffset = fdt_first_subnode(fit, conf_noffset);
-	     noffset >= 0;
-	     noffset = fdt_next_subnode(fit, noffset)) {
+	fdt_for_each_subnode(fit, noffset, conf_noffset) {
 		const char *name = fit_get_name(fit, noffset, NULL);
 
 		if (!strncmp(name, FIT_SIG_NODENAME,
@@ -444,9 +438,7 @@  int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
 		return 0;
 	}
 
-	for (noffset = fdt_first_subnode(sig_blob, sig_node);
-	     noffset >= 0;
-	     noffset = fdt_next_subnode(sig_blob, noffset)) {
+	fdt_for_each_subnode(sig_blob, noffset, sig_node) {
 		const char *required;
 		int ret;