]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: xillybus: Use devm_kcalloc() for arrays
authorEli Billauer <eli.billauer@gmail.com>
Thu, 4 Sep 2014 14:47:40 +0000 (17:47 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:58:18 +0000 (13:58 -0700)
Replace devm_kzalloc where it applies.

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 d5a7202b0ac75b010ce5a3e652b7b7058a5642fe..cacd560dd6d9bc2bfc1ad25bc6010293692360c4 100644 (file)
@@ -329,9 +329,9 @@ static int xilly_get_dma_buffers(struct xilly_endpoint *ep,
        struct xilly_buffer *this_buffer = NULL; /* Init to silence warning */
 
        if (buffers) { /* Not the message buffer */
-               this_buffer = devm_kzalloc(
-                       dev, bufnum * sizeof(struct xilly_buffer),
-                       GFP_KERNEL);
+               this_buffer = devm_kcalloc(dev, bufnum,
+                                          sizeof(struct xilly_buffer),
+                                          GFP_KERNEL);
 
                if (!this_buffer)
                        return -ENOMEM;
@@ -434,13 +434,13 @@ static int xilly_setupchannels(struct xilly_endpoint *ep,
                .regdirection = 0x80000000,
        };
 
-       channel = devm_kzalloc(dev, ep->num_channels *
+       channel = devm_kcalloc(dev, ep->num_channels,
                               sizeof(struct xilly_channel), GFP_KERNEL);
 
        if (!channel)
                goto memfail;
 
-       ep->channels = devm_kzalloc(dev, (ep->num_channels + 1) *
+       ep->channels = devm_kcalloc(dev, ep->num_channels + 1,
                                    sizeof(struct xilly_channel *),
                                    GFP_KERNEL);
 
@@ -517,9 +517,9 @@ static int xilly_setupchannels(struct xilly_endpoint *ep,
                        bytebufsize = channel->rd_buf_size = bufsize *
                                (1 << channel->log2_element_size);
 
-                       buffers = devm_kzalloc(dev,
-                               bufnum * sizeof(struct xilly_buffer *),
-                               GFP_KERNEL);
+                       buffers = devm_kcalloc(dev, bufnum,
+                                              sizeof(struct xilly_buffer *),
+                                              GFP_KERNEL);
 
                        if (!buffers)
                                goto memfail;