| Message ID | 20170223163040.9303-1-heiko@sntech.de |
|---|---|
| State | Accepted |
| Commit | d905cf7365ad25c55129ce6bc473b67a642d7817 |
| Delegated to: | Simon Glass |
| Headers | show |
On 23 February 2017 at 09:30, Heiko Stuebner <heiko@sntech.de> wrote: > Documentation says that we're returning true/false, not 1/0 so adapt > the function to return actual booleans. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/core/util.c | 12 ++++++------ > include/dm/util.h | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 2 March 2017 at 21:52, Simon Glass <sjg@chromium.org> wrote: > On 23 February 2017 at 09:30, Heiko Stuebner <heiko@sntech.de> wrote: >> Documentation says that we're returning true/false, not 1/0 so adapt >> the function to return actual booleans. >> >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> --- >> drivers/core/util.c | 12 ++++++------ >> include/dm/util.h | 2 +- >> 2 files changed, 7 insertions(+), 7 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/drivers/core/util.c b/drivers/core/util.c index bd4de7acd6..5ceac8bbb1 100644 --- a/drivers/core/util.c +++ b/drivers/core/util.c @@ -37,17 +37,17 @@ int list_count_items(struct list_head *head) return count; } -int dm_fdt_pre_reloc(const void *blob, int offset) +bool dm_fdt_pre_reloc(const void *blob, int offset) { if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL)) - return 1; + return true; #ifdef CONFIG_TPL_BUILD if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL)) - return 1; + return true; #elif defined(CONFIG_SPL_BUILD) if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL)) - return 1; + return true; #else /* * In regular builds individual spl and tpl handling both @@ -55,8 +55,8 @@ int dm_fdt_pre_reloc(const void *blob, int offset) */ if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL) || fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL)) - return 1; + return true; #endif - return 0; + return false; } diff --git a/include/dm/util.h b/include/dm/util.h index 32060ab30e..45529ce0e6 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -72,6 +72,6 @@ static inline void dm_dump_devres(void) * * Returns true if node is needed in SPL/TL, false otherwise. */ -int dm_fdt_pre_reloc(const void *blob, int offset); +bool dm_fdt_pre_reloc(const void *blob, int offset); #endif
Documentation says that we're returning true/false, not 1/0 so adapt the function to return actual booleans. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/core/util.c | 12 ++++++------ include/dm/util.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)