From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Tue, 5 May 2015 22:36:30 +0000 (-0400)
Subject: staging: unisys: decouple visor_memregion_{read, write}()
X-Git-Tag: v4.2-rc1~88^2~808
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=213e6a61328689f9106758487a2fefb69d074c6f;p=karo-tx-linux.git

staging: unisys: decouple visor_memregion_{read, write}()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c b/drivers/staging/unisys/visorutil/memregion_direct.c
index 0ee7cb2fafd0..96460d7fdf0a 100644
--- a/drivers/staging/unisys/visorutil/memregion_direct.c
+++ b/drivers/staging/unisys/visorutil/memregion_direct.c
@@ -124,35 +124,27 @@ visor_memregion_resize(struct memregion *memregion, ulong newsize)
 }
 EXPORT_SYMBOL_GPL(visor_memregion_resize);
 
-static int
-memregion_readwrite(BOOL is_write,
-		    struct memregion *memregion, ulong offset,
-		    void *local, ulong nbytes)
+int
+visor_memregion_read(struct memregion *memregion, ulong offset, void *dest,
+		     ulong nbytes)
 {
 	if (offset + nbytes > memregion->nbytes)
 		return -EIO;
 
-	if (is_write)
-		memcpy_toio(memregion->mapped + offset, local, nbytes);
-	else
-		memcpy_fromio(local, memregion->mapped + offset, nbytes);
-
+	memcpy_fromio(dest, memregion->mapped + offset, nbytes);
 	return 0;
 }
-
-int
-visor_memregion_read(struct memregion *memregion, ulong offset, void *dest,
-		     ulong nbytes)
-{
-	return memregion_readwrite(FALSE, memregion, offset, dest, nbytes);
-}
 EXPORT_SYMBOL_GPL(visor_memregion_read);
 
 int
 visor_memregion_write(struct memregion *memregion, ulong offset, void *src,
 		      ulong nbytes)
 {
-	return memregion_readwrite(TRUE, memregion, offset, src, nbytes);
+	if (offset + nbytes > memregion->nbytes)
+		return -EIO;
+
+	memcpy_toio(memregion->mapped + offset, src, nbytes);
+	return 0;
 }
 EXPORT_SYMBOL_GPL(visor_memregion_write);