summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorLaura Abbott <lauraa@codeaurora.org>2014-10-24 19:49:01 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-10-29 17:20:51 +0000
commit005757298fdd3c181a11f463fea2646ca816a9a5 (patch)
tree5c6ba6af4c58f331b8a6deac84b8de1eecd98357 /arch/arm/mm
parentd0b92845e54590f0b59fccc0e10159f3b84825bd (diff)
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>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/dma-mapping.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index c245d903927f..e8907117861e 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;
}
/*