err.h: add (missing) unlikely() to IS_ERR_OR_NULL()

vireshk · torvalds · commit dfffa587a6bc · 2016-01-16T11:17:24.000-08:00
IS_ERR_VALUE() already contains it and so we need to add this only to
the !ptr check.  That will allow users of IS_ERR_OR_NULL(), to not add
this compiler flag.

Signed-off-by: Viresh Kumar &lt;viresh.kumar@linaro.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/include/linux/err.h b/include/linux/err.h
@@ -37,7 +37,7 @@ static inline bool __must_check IS_ERR(__force const void *ptr)
 
 static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
 {
-	return !ptr || IS_ERR_VALUE((unsigned long)ptr);
+	return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static inline bool __must_check IS_ERR(__force const void *ptr)`
`37`	`37`
`38`	`38`	`static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)`
`39`	`39`	`{`
`40`		`- return !ptr \|\| IS_ERR_VALUE((unsigned long)ptr);`
	`40`	`+ return unlikely(!ptr) \|\| IS_ERR_VALUE((unsigned long)ptr);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`