diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2008-07-07 10:14:15 +1000 |
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-08-24 22:20:49 -0400 |
| commit | c66830263af19831f2b7db307f79d1943febf7f9 (patch) | |
| tree | abb2037bd454ea11f56c527ad52c66bbc7291681 /include/libfdt.h | |
| parent | ef4e8ce1beb5b93aedda5a4c1b90bfd989c6791e (diff) | |
| download | blackbird-obmc-uboot-c66830263af19831f2b7db307f79d1943febf7f9.tar.gz blackbird-obmc-uboot-c66830263af19831f2b7db307f79d1943febf7f9.zip | |
dtc: Enable and fix -Wcast-qual warnings
Enabling -Wcast-qual warnings in dtc shows up a number of places where
we are incorrectly discarding a const qualification. There are also
some places where we are intentionally discarding the 'const', and we
need an ugly cast through uintptr_t to suppress the warning. However,
most of these are pretty well isolated with the *_w() functions. So
in the interests of maximum safety with const qualifications, this
patch enables the warnings and fixes the existing complaints.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
Diffstat (limited to 'include/libfdt.h')
| -rw-r--r-- | include/libfdt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/libfdt.h b/include/libfdt.h index 2a2b23d6c1..7e043ef759 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -125,7 +125,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, int checklen); static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen) { - return (void *)fdt_offset_ptr(fdt, offset, checklen); + return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen); } uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset); @@ -375,8 +375,8 @@ static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset, const char *name, int *lenp) { - return (struct fdt_property *)fdt_get_property(fdt, nodeoffset, - name, lenp); + return (struct fdt_property *)(uintptr_t) + fdt_get_property(fdt, nodeoffset, name, lenp); } /** @@ -411,7 +411,7 @@ const void *fdt_getprop(const void *fdt, int nodeoffset, static inline void *fdt_getprop_w(void *fdt, int nodeoffset, const char *name, int *lenp) { - return (void *)fdt_getprop(fdt, nodeoffset, name, lenp); + return (void *)(uintptr_t)fdt_getprop(fdt, nodeoffset, name, lenp); } /** |
