Skip to contentSkip to conversation

dm: ofnode: Fix compile breakage with OF_CHECKS enabled

PATCH New Stefan Roese 2 participants 4 messages Sep 23, 2020 – Oct 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm: ofnode: Fix compile breakage with OF_CHECKS enabled

Include missing log.h and change _ofnode_to_np() to ofnode_to_np() so that compiling with OF_CHECKS enabled does not break.

---
 include/dm/ofnode.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
include/dm/ofnode.h +4 -3
index 8df2facf99..d7852daf7f 100644
@@ -10,6 +10,7 @@
 /* TODO(sjg at chromium.org): Drop fdtdec.h include */
 #include <fdtdec.h>
 #include <dm/of.h>
+#include <log.h>
 
 /* Enable checks to protect against invalid calls */
 #undef OF_CHECKS
@@ -84,7 +85,7 @@ struct ofprop {
 };
 
 /**
- * _ofnode_to_np() - convert an ofnode to a live DT node pointer
+ * ofnode_to_np() - convert an ofnode to a live DT node pointer
  *
  * This cannot be called if the reference contains an offset.
  *
@@ -182,8 +183,8 @@ static inline bool ofnode_is_np(ofnode node)
 	 * live tree is in use.
 	 */
 	assert(!ofnode_valid(node) ||
-	       (of_live_active() ? _ofnode_to_np(node)
-				  : _ofnode_to_np(node)));
+	       (of_live_active() ? ofnode_to_np(node)
+				  : ofnode_to_np(node)));
 #endif
 	return of_live_active() && ofnode_valid(node);
 }
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 dm: ofnode: Fix compile breakage with OF_CHECKS enabled

Hi Stefan,

Quoted 9 lines · Stefan Roese

Include missing log.h and change _ofnode_to_np() to ofnode_to_np() so that compiling with OF_CHECKS enabled does not break.

---
 include/dm/ofnode.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

We need to find a way to test this, perhaps by enabling it on one of the sandbox builds and calling a few functions with invalid data.

Regards,
SImon

#2 lore raw

PATCH 1/1 dm: ofnode: Fix compile breakage with OF_CHECKS enabled

Hi Stefan,

Quoted 9 lines · Stefan Roese

Include missing log.h and change _ofnode_to_np() to ofnode_to_np() so that compiling with OF_CHECKS enabled does not break.

---
 include/dm/ofnode.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

We need to find a way to test this, perhaps by enabling it on one of the sandbox builds and calling a few functions with invalid data.

Regards,
SImon

Applied to u-boot-dm/next, thanks!

#3 lore raw

PATCH 1/1 dm: ofnode: Fix compile breakage with OF_CHECKS enabled

Hi Simon,

Quoted 13 lines · Simon Glass

Hi Stefan,

Quoted 9 lines · Stefan Roese

Include missing log.h and change _ofnode_to_np() to ofnode_to_np() so that compiling with OF_CHECKS enabled does not break.

---
  include/dm/ofnode.h | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
Quoted 4 lines

We need to find a way to test this, perhaps by enabling it on one of the sandbox builds and calling a few functions with invalid data.

Understood. I'll try to find some time for this in the next days.

Thanks,
Stefan