diff options
Diffstat (limited to 'scripts/dtc/libfdt/libfdt_internal.h')
| -rw-r--r-- | scripts/dtc/libfdt/libfdt_internal.h | 32 | 
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/dtc/libfdt/libfdt_internal.h b/scripts/dtc/libfdt/libfdt_internal.h index 02cfa6fb612d..7681e192295b 100644 --- a/scripts/dtc/libfdt/libfdt_internal.h +++ b/scripts/dtc/libfdt/libfdt_internal.h @@ -1,5 +1,5 @@ -#ifndef _LIBFDT_INTERNAL_H -#define _LIBFDT_INTERNAL_H +#ifndef LIBFDT_INTERNAL_H +#define LIBFDT_INTERNAL_H  /*   * libfdt - Flat Device Tree manipulation   * Copyright (C) 2006 David Gibson, IBM Corporation. @@ -57,27 +57,27 @@  #define FDT_CHECK_HEADER(fdt) \  	{ \ -		int __err; \ -		if ((__err = fdt_check_header(fdt)) != 0) \ -			return __err; \ +		int err_; \ +		if ((err_ = fdt_check_header(fdt)) != 0) \ +			return err_; \  	} -int _fdt_check_node_offset(const void *fdt, int offset); -int _fdt_check_prop_offset(const void *fdt, int offset); -const char *_fdt_find_string(const char *strtab, int tabsize, const char *s); -int _fdt_node_end_offset(void *fdt, int nodeoffset); +int fdt_check_node_offset_(const void *fdt, int offset); +int fdt_check_prop_offset_(const void *fdt, int offset); +const char *fdt_find_string_(const char *strtab, int tabsize, const char *s); +int fdt_node_end_offset_(void *fdt, int nodeoffset); -static inline const void *_fdt_offset_ptr(const void *fdt, int offset) +static inline const void *fdt_offset_ptr_(const void *fdt, int offset)  {  	return (const char *)fdt + fdt_off_dt_struct(fdt) + offset;  } -static inline void *_fdt_offset_ptr_w(void *fdt, int offset) +static inline void *fdt_offset_ptr_w_(void *fdt, int offset)  { -	return (void *)(uintptr_t)_fdt_offset_ptr(fdt, offset); +	return (void *)(uintptr_t)fdt_offset_ptr_(fdt, offset);  } -static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n) +static inline const struct fdt_reserve_entry *fdt_mem_rsv_(const void *fdt, int n)  {  	const struct fdt_reserve_entry *rsv_table =  		(const struct fdt_reserve_entry *) @@ -85,11 +85,11 @@ static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int  	return rsv_table + n;  } -static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n) +static inline struct fdt_reserve_entry *fdt_mem_rsv_w_(void *fdt, int n)  { -	return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n); +	return (void *)(uintptr_t)fdt_mem_rsv_(fdt, n);  }  #define FDT_SW_MAGIC		(~FDT_MAGIC) -#endif /* _LIBFDT_INTERNAL_H */ +#endif /* LIBFDT_INTERNAL_H */  | 
