Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e8b8726 authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatarJulia Lawall <julia.lawall@lip6.fr>
Suggested-by: default avatar"Michael S. Tsirkin" <mst@redhat.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent ad81f054

include/linux/err.h

+4 −1
Original line number Diff line number Diff line
@@ -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 */