Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / include / linux / err.h

diff --git a/include/linux/err.h b/include/linux/err.h
index 4e08c4fe685bf65cc3e381e8b805a9f8e2812a0f..5b3c8bcf700af26f88812491f0bf52b8a00537fa 100644 (file)
--- 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/mtd/compat.h>
-#endif
+#include <linux/compat.h>
 
 #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 */