diff options
author | Elliott Hughes <enh@google.com> | 2013-03-12 15:43:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-12 15:43:39 -0700 |
commit | 4733a3a67eab8ac500a5a8f1f508d1c444fb713a (patch) | |
tree | fe0fb08ffa7b48be2b132c477a6eff21759ee1f1 /original | |
parent | 07289c3ee34ca96068ddfe533310f1b9c5d15686 (diff) | |
parent | 35541743e11f2249e5db31a66607a9cb0133f62e (diff) | |
download | kernel-headers-4733a3a67eab8ac500a5a8f1f508d1c444fb713a.tar.gz |
am 35541743: am aa4bc822: Merge "Update err.h to get the assembler guards."
* commit '35541743e11f2249e5db31a66607a9cb0133f62e':
Update err.h to get the assembler guards.
Diffstat (limited to 'original')
-rw-r--r-- | original/linux/err.h | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/original/linux/err.h b/original/linux/err.h index cd3b367..f2edce2 100644 --- a/original/linux/err.h +++ b/original/linux/err.h @@ -15,21 +15,51 @@ */ #define MAX_ERRNO 4095 +#ifndef __ASSEMBLY__ + #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO) -static inline void *ERR_PTR(long error) +static inline void * __must_check ERR_PTR(long error) { return (void *) error; } -static inline long PTR_ERR(const void *ptr) +static inline long __must_check PTR_ERR(const void *ptr) { return (long) ptr; } -static inline long IS_ERR(const void *ptr) +static inline long __must_check IS_ERR(const void *ptr) { return IS_ERR_VALUE((unsigned long)ptr); } +static inline long __must_check IS_ERR_OR_NULL(const void *ptr) +{ + return !ptr || 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(const void *ptr) +{ + /* cast away the const */ + return (void *) ptr; +} + +static inline int __must_check PTR_RET(const void *ptr) +{ + if (IS_ERR(ptr)) + return PTR_ERR(ptr); + else + return 0; +} + +#endif + #endif /* _LINUX_ERR_H */ |