]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()
authorJes Sorensen <Jes.Sorensen@redhat.com>
Sun, 5 Oct 2014 14:33:23 +0000 (16:33 +0200)
committerRoland Dreier <roland@purestorage.com>
Fri, 10 Oct 2014 16:43:01 +0000 (09:43 -0700)
Get rid of obfuscating ocrdma_alloc_mqe() kzalloc() wrapper as all it
did was to make it less visible that the structure was already cleared
on allocation.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
drivers/infiniband/hw/ocrdma/ocrdma_hw.c

index 10a261c4ea9806764b7bf1305098e5a8cc7374e1..0ac34cb0fcae32cbb80ee77edd9de00cd2e6815b 100644 (file)
@@ -348,11 +348,6 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
        return mqe;
 }
 
-static void *ocrdma_alloc_mqe(void)
-{
-       return kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
-}
-
 static void ocrdma_free_q(struct ocrdma_dev *dev, struct ocrdma_queue_info *q)
 {
        dma_free_coherent(&dev->nic_info.pdev->dev, q->size, q->va, q->dma);
@@ -1189,10 +1184,10 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
 {
        struct ocrdma_rdma_stats_req *req = dev->stats_mem.va;
        struct ocrdma_mqe *mqe = &dev->stats_mem.mqe;
-       struct ocrdma_rdma_stats_resp *old_stats = NULL;
+       struct ocrdma_rdma_stats_resp *old_stats;
        int status;
 
-       old_stats = kzalloc(sizeof(*old_stats), GFP_KERNEL);
+       old_stats = kmalloc(sizeof(*old_stats), GFP_KERNEL);
        if (old_stats == NULL)
                return -ENOMEM;
 
@@ -1235,10 +1230,9 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
        struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp;
        struct mgmt_hba_attribs *hba_attribs;
 
-       mqe = ocrdma_alloc_mqe();
+       mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
        if (!mqe)
                return status;
-       memset(mqe, 0, sizeof(*mqe));
 
        dma.size = sizeof(struct ocrdma_get_ctrl_attribs_rsp);
        dma.va   = dma_alloc_coherent(&dev->nic_info.pdev->dev,