From d0ccb9b140b472039732de102fc14597eedb14df Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 18 Feb 2008 18:06:31 +1100 Subject: libfdt: Trivial cleanup for CHECK_HEADER) Currently the CHECK_HEADER() macro is defined local to fdt_ro.c. However, there are a handful of functions (fdt_move, rw_check_header, fdt_open_into) from other files which could also use it (currently they open-code something more-or-less identical). Therefore, this patch moves CHECK_HEADER() to libfdt_internal.h and uses it in those places. Signed-off-by: David Gibson --- libfdt/fdt_rw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libfdt/fdt_rw.c') diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c index ac5019560f..0df472bc5e 100644 --- a/libfdt/fdt_rw.c +++ b/libfdt/fdt_rw.c @@ -69,10 +69,8 @@ static int _blocks_misordered(const void *fdt, static int rw_check_header(void *fdt) { - int err; + CHECK_HEADER(fdt); - if ((err = fdt_check_header(fdt))) - return err; if (fdt_version(fdt) < 17) return -FDT_ERR_BADVERSION; if (_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry), @@ -399,9 +397,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) int newsize; void *tmp; - err = fdt_check_header(fdt); - if (err) - return err; + CHECK_HEADER(fdt); mem_rsv_size = (fdt_num_mem_rsv(fdt)+1) * sizeof(struct fdt_reserve_entry); -- cgit v1.2.1