diff options
| author | Viresh Kumar | 2015-07-31 10:38:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-01 01:18:43 +0200 |
| commit | 7f44cb0ba88b40c09c5bdfc46186e09f42b1a9b0 (patch) | |
| tree | a4e0177377ccf9baf3c888e99bb8f71e8ed98e5e /drivers/staging/android | |
| parent | linux-next: drivers: staging: most: Fix return value (diff) | |
| download | kernel-qcow2-linux-7f44cb0ba88b40c09c5bdfc46186e09f42b1a9b0.tar.gz kernel-qcow2-linux-7f44cb0ba88b40c09c5bdfc46186e09f42b1a9b0.tar.xz kernel-qcow2-linux-7f44cb0ba88b40c09c5bdfc46186e09f42b1a9b0.zip | |
drivers: staging: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.
This also replaces an IS_ERR(x) + (x == NULL) check to IS_ERR_OR_NULL
check.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/ashmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 7958d5c9663f..cefc208c313a 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -388,7 +388,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) /* ... and allocate the backing shmem file */ vmfile = shmem_file_setup(name, asma->size, vma->vm_flags); - if (unlikely(IS_ERR(vmfile))) { + if (IS_ERR(vmfile)) { ret = PTR_ERR(vmfile); goto out; } |