From 3610970872351b58d9cfdbd9bf9aeabc6adac7b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pierre-Cl=C3=A9ment=20Tosi?= Date: Thu, 30 Sep 2021 17:52:45 +0200 Subject: [PATCH] dm: Fix util.h's broken include guard MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix up the header's include guard to contain the definition of dm_priv_to_rw(), which was erroneously added outside of it, by moving its #endif to the end of the file (i.e. where it belongs). This removes the risk of compilation errors resulting from the redefinition of that function where the header might have been (indirectly) included more than once. Fixes: cfb9c9b77c2 ("dm: core: Use separate priv/plat data region") Signed-off-by: Pierre-Clément Tosi Cc: Simon Glass --- include/dm/util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dm/util.h b/include/dm/util.h index c634e470e7..17baf55c25 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -48,8 +48,6 @@ void dm_dump_driver_compat(void); /* Dump out a list of drivers with static platform data */ void dm_dump_static_driver_info(void); -#endif - #if CONFIG_IS_ENABLED(OF_PLATDATA_INST) && CONFIG_IS_ENABLED(READ_ONLY) void *dm_priv_to_rw(void *priv); #else @@ -58,3 +56,5 @@ static inline void *dm_priv_to_rw(void *priv) return priv; } #endif + +#endif -- 2.39.5