diff options
| author | Heiko Schocher <hs@denx.de> | 2014-06-24 10:10:02 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-25 17:02:33 -0400 |
| commit | cc96c9a79c4d33d70cd448380aca98916b994464 (patch) | |
| tree | 6d9037354680dc124fa0ecfb725a16aefd3ec866 /include | |
| parent | c068d44aac8e3bc3fa14ea60ecdfe52598d83096 (diff) | |
| download | blackbird-obmc-uboot-cc96c9a79c4d33d70cd448380aca98916b994464.tar.gz blackbird-obmc-uboot-cc96c9a79c4d33d70cd448380aca98916b994464.zip | |
linux include: add ERR_CAST
add missing ERR_CAST to linux/err.h as it is needed for ubi/ubifs support
Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/err.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/linux/err.h b/include/linux/err.h index 96c0c72baa..5b3c8bcf70 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -1,12 +1,8 @@ #ifndef _LINUX_ERR_H #define _LINUX_ERR_H -/* XXX U-BOOT XXX */ -#if 0 #include <linux/compiler.h> -#else #include <linux/compat.h> -#endif #include <asm/errno.h> @@ -40,6 +36,19 @@ static inline long IS_ERR(const void *ptr) return IS_ERR_VALUE((unsigned long)ptr); } +/** + * ERR_CAST - Explicitly cast an error-valued pointer to another pointer type + * @ptr: The pointer to cast. + * + * Explicitly cast an error-valued pointer to another pointer type in such a + * way as to make it clear that's what's going on. + */ +static inline void * __must_check ERR_CAST(__force const void *ptr) +{ + /* cast away the const */ + return (void *) ptr; +} + #endif #endif /* _LINUX_ERR_H */ |
