From: Laura Abbott <lauraa@codeaurora.org>
Date: Fri, 24 Oct 2014 18:49:01 +0000 (+0100)
Subject: ARM: 8181/1: Drop extra return statement
X-Git-Tag: v4.14-rc1~6315^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=005757298fdd3c181a11f463fea2646ca816a9a5;p=platform%2Fkernel%2Flinux-rpi.git

ARM: 8181/1: Drop extra return statement

Commit 513510ddba9650fc7da456eefeb0ead7632324f6
(common: dma-mapping: introduce common remapping functions)
managed to end up with an extra return statement from the
original patch. Drop it.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index c245d90..e890711 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1198,7 +1198,6 @@ __iommu_alloc_remap(struct page **pages, size_t size, gfp_t gfp, pgprot_t prot,
 {
 	return dma_common_pages_remap(pages, size,
 			VM_ARM_DMA_CONSISTENT | VM_USERMAP, prot, caller);
-	return NULL;
 }
 
 /*