From: Eli Billauer <eli.billauer@gmail.com>
Date: Thu, 4 Sep 2014 14:47:44 +0000 (+0300)
Subject: staging: xillybus: Removed unnecessary error message
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31ca128d555d35e8bc53e6a3afce09f4c72b372b;p=linux-beck.git

staging: xillybus: Removed unnecessary error message

Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/staging/xillybus/xillybus_core.c
index 305081535c02..222457fe9bb8 100644
--- a/drivers/staging/xillybus/xillybus_core.c
+++ b/drivers/staging/xillybus/xillybus_core.c
@@ -438,14 +438,14 @@ static int xilly_setupchannels(struct xilly_endpoint *ep,
 			       sizeof(struct xilly_channel), GFP_KERNEL);
 
 	if (!channel)
-		goto memfail;
+		return -ENOMEM;
 
 	ep->channels = devm_kcalloc(dev, ep->num_channels + 1,
 				    sizeof(struct xilly_channel *),
 				    GFP_KERNEL);
 
 	if (!ep->channels)
-		goto memfail;
+		return -ENOMEM;
 
 	ep->channels[0] = NULL; /* Channel 0 is message buf. */
 
@@ -522,7 +522,7 @@ static int xilly_setupchannels(struct xilly_endpoint *ep,
 					       GFP_KERNEL);
 
 			if (!buffers)
-				goto memfail;
+				return -ENOMEM;
 		} else {
 			bytebufsize = bufsize << 2;
 		}
@@ -557,7 +557,7 @@ static int xilly_setupchannels(struct xilly_endpoint *ep,
 		}
 
 		if (rc)
-			goto memfail;
+			return -ENOMEM;
 	}
 
 	if (!msg_buf_done) {
@@ -566,11 +566,6 @@ static int xilly_setupchannels(struct xilly_endpoint *ep,
 		return -ENODEV;
 	}
 	return 0;
-
-memfail:
-	dev_err(ep->dev,
-		"Failed to assign DMA buffer memory. Aborting.\n");
-	return -ENOMEM;
 }
 
 static void xilly_scan_idt(struct xilly_endpoint *endpoint,