lkml.org 
[lkml]   [2015]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V1 Resend 01/10] err.h: add (missing) unlikely() to IS_ERR_OR_NULL()
    Date
    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 <viresh.kumar@linaro.org>
    ---
    include/linux/err.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/err.h b/include/linux/err.h
    index a729120644d5..56762ab41713 100644
    --- 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);
    }

    /**
    --
    2.4.0


    \
     
     \ /
      Last update: 2015-08-12 13:01    [W:2.580 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site