summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2014-06-24 10:10:02 +0200
committerTom Rini <trini@ti.com>2014-08-25 17:02:33 -0400
commitcc96c9a79c4d33d70cd448380aca98916b994464 (patch)
tree6d9037354680dc124fa0ecfb725a16aefd3ec866 /include/linux
parentc068d44aac8e3bc3fa14ea60ecdfe52598d83096 (diff)
downloadu-boot-imx-cc96c9a79c4d33d70cd448380aca98916b994464.zip
u-boot-imx-cc96c9a79c4d33d70cd448380aca98916b994464.tar.gz
u-boot-imx-cc96c9a79c4d33d70cd448380aca98916b994464.tar.bz2
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/linux')
-rw-r--r--include/linux/err.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/include/linux/err.h b/include/linux/err.h
index 96c0c72..5b3c8bc 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 */