]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: xillybus: Removed unnecessary error message
authorEli Billauer <eli.billauer@gmail.com>
Thu, 4 Sep 2014 14:47:44 +0000 (17:47 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:58:19 +0000 (13:58 -0700)
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>
drivers/staging/xillybus/xillybus_core.c

index 305081535c02d5f4b9c0b1a5949ea375241c5308..222457fe9bb85dd57b013b0008dd8cc28e9fa4a9 100644 (file)
@@ -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,