From: Prasanna Karthik <mkarthi3@visteon.com>
Date: Tue, 8 Dec 2015 16:30:25 +0000 (+0100)
Subject: ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38fc2f6c98262913388de338d5b0cda67e3f78cd;p=linux-beck.git

ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check

Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Signed-off-by: Prasanna Karthik <mkarthi3@visteon.com>
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c
index 54a5aeab988d..994e971a8538 100644
--- a/arch/arm/kernel/vdso.c
+++ b/arch/arm/kernel/vdso.c
@@ -224,7 +224,7 @@ static int install_vvar(struct mm_struct *mm, unsigned long addr)
 				       VM_READ | VM_MAYREAD,
 				       &vdso_data_mapping);
 
-	return IS_ERR(vma) ? PTR_ERR(vma) : 0;
+	return PTR_ERR_OR_ZERO(vma);
 }
 
 /* assumes mmap_sem is write-locked */