[PATCH v5 21/29] image: Drop #ifdefs for fit_print_contents()

Simon Glass
2021-09-26T01:49:19Z

Use a simple return to drop the unwanted code.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

common/image-fit.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index 2f20bb7e446..3952ab749ad 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -170,7 +170,6 @@ int fit_get_subimage_count(const void *fit, int images_noffset)
return count;
}

-#if CONFIG_IS_ENABLED(FIT_PRINT)
/**
* fit_image_print_data() - prints out the hash node details
* @fit: pointer to the FIT format image header
@@ -380,6 +379,9 @@ void fit_print_contents(const void *fit)
const char *p;
time_t timestamp;

+ if (!CONFIG_IS_ENABLED(FIT_PRINT))
+ return;
+
/* Indent string is defined in header image.h */
p = IMAGE_INDENT_STRING;

@@ -482,6 +484,9 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
int ndepth;
int ret;

+ if (!CONFIG_IS_ENABLED(FIT_PRINT))
+ return;
+
/* Mandatory properties */
ret = fit_get_desc(fit, image_noffset, &desc);
printf("%s Description: ", p);
@@ -575,10 +580,6 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
}
}
}
-#else
-void fit_print_contents(const void *fit) { }
-void fit_image_print(const void *fit, int image_noffset, const char *p) { }
-#endif /* CONFIG_IS_ENABLED(FIT_PRINT) */

/**
* fit_get_desc - get node description property
--
2.33.0.685.g46640cef36-goog