staging: unisys: remove ERRDEV macros

[deliverable/linux.git] / drivers / staging / unisys / visorutil / memregion_direct.c

diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c b/drivers/staging/unisys/visorutil/memregion_direct.c
index aa52a6fd1bf08f5ed2cd3b4f5ec04af75c6f541b..07aa2975bd6a28993f95b754dcd74b33e6183b6b 100644 (file)
--- a/drivers/staging/unisys/visorutil/memregion_direct.c
+++ b/drivers/staging/unisys/visorutil/memregion_direct.c
@@ -44,10 +44,9 @@ visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes)
        struct memregion *memregion;
 
        memregion = kzalloc(sizeof(*memregion), GFP_KERNEL | __GFP_NORETRY);
-       if (memregion == NULL) {
-               ERRDRV("visor_memregion_create allocation failed");
+       if (memregion == NULL)
                return NULL;
-       }
+
        memregion->physaddr = physaddr;
        memregion->nbytes = nbytes;
        memregion->overlapped = FALSE;
@@ -71,20 +70,16 @@ visor_memregion_create_overlapped(struct memregion *parent, ulong offset,
 {
        struct memregion *memregion = NULL;
 
-       if (parent == NULL) {
-               ERRDRV("%s parent is NULL", __func__);
+       if (parent == NULL)
                return NULL;
-       }
-       if (parent->mapped == NULL) {
-               ERRDRV("%s parent is not mapped!", __func__);
+
+       if (parent->mapped == NULL)
                return NULL;
-       }
+
        if ((offset >= parent->nbytes) ||
-           ((offset + nbytes) >= parent->nbytes)) {
-               ERRDRV("%s range (%lu,%lu) out of parent range",
-                      __func__, offset, nbytes);
+           ((offset + nbytes) >= parent->nbytes))
                return NULL;
-       }
+
        memregion = kzalloc(sizeof(*memregion), GFP_KERNEL|__GFP_NORETRY);
        if (memregion == NULL)
                return NULL;
@@ -105,17 +100,11 @@ mapit(struct memregion *memregion)
        ulong nbytes = memregion->nbytes;
 
        memregion->requested = FALSE;
-       if (!request_mem_region(physaddr, nbytes, MYDRVNAME))
-               ERRDRV("cannot reserve channel memory @0x%lx for 0x%lx-- no big deal",
-                      physaddr, nbytes);
-       else
+       if (request_mem_region(physaddr, nbytes, MYDRVNAME))
                memregion->requested = TRUE;
        memregion->mapped = ioremap_cache(physaddr, nbytes);
-       if (memregion->mapped == NULL) {
-               ERRDRV("cannot ioremap_cache channel memory @0x%lx for 0x%lx",
-                      physaddr, nbytes);
+       if (!memregion->mapped)
                return FALSE;
-       }
        return TRUE;
 }
 
@@ -179,10 +168,9 @@ memregion_readwrite(BOOL is_write,
                    struct memregion *memregion, ulong offset,
                    void *local, ulong nbytes)
 {
-       if (offset + nbytes > memregion->nbytes) {
-               ERRDRV("memregion_readwrite offset out of range!!");
+       if (offset + nbytes > memregion->nbytes)
                return -EIO;
-       }
+
        if (is_write)
                memcpy_toio(memregion->mapped + offset, local, nbytes);
        else