From: Rusty Russell Date: Mon, 15 Jul 2013 01:49:32 +0000 (+0930) Subject: PTR_RET is now PTR_ERR_OR_ZERO X-Git-Tag: upstream/snapshot3+hdmi~4436^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e8b8726ad503214ba66e34aed69aff41de33489;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git PTR_RET is now PTR_ERR_OR_ZERO True, it's often used in return statements, but after much bikeshedding it's probably better to have an explicit name. (I tried just putting the IS_ERR check inside PTR_ERR itself and gcc usually generated no more code. But that clashes current expectations of how PTR_ERR behaves, so having a separate function is better). Suggested-by: Julia Lawall Suggested-by: "Michael S. Tsirkin" Cc: Julia Lawall Cc: "Michael S. Tsirkin" Signed-off-by: Rusty Russell --- diff --git a/include/linux/err.h b/include/linux/err.h index 221fcfb..15f92e0 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -52,7 +52,7 @@ static inline void * __must_check ERR_CAST(__force const void *ptr) return (void *) ptr; } -static inline int __must_check PTR_RET(__force const void *ptr) +static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr) { if (IS_ERR(ptr)) return PTR_ERR(ptr); @@ -60,6 +60,9 @@ static inline int __must_check PTR_RET(__force const void *ptr) return 0; } +/* Deprecated */ +#define PTR_RET(p) PTR_ERR_OR_ZERO(p) + #endif #endif /* _LINUX_ERR_H */