diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-10-05 10:33:23 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2014-10-10 12:43:01 -0400 |
commit | beb9b703811736adfc608034d1f0d5cf0c8a7073 (patch) | |
tree | 44b303789be34211f009caa35fbbfd5a20814a05 /drivers/infiniband | |
parent | e5dc9409933b21732a8c370e9f7cf79c2c92cbcb (diff) |
RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()
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>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c index 10a261c4ea98..0ac34cb0fcae 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c | |||
@@ -348,11 +348,6 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len) | |||
348 | return mqe; | 348 | return mqe; |
349 | } | 349 | } |
350 | 350 | ||
351 | static void *ocrdma_alloc_mqe(void) | ||
352 | { | ||
353 | return kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL); | ||
354 | } | ||
355 | |||
356 | static void ocrdma_free_q(struct ocrdma_dev *dev, struct ocrdma_queue_info *q) | 351 | static void ocrdma_free_q(struct ocrdma_dev *dev, struct ocrdma_queue_info *q) |
357 | { | 352 | { |
358 | dma_free_coherent(&dev->nic_info.pdev->dev, q->size, q->va, q->dma); | 353 | 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) | |||
1189 | { | 1184 | { |
1190 | struct ocrdma_rdma_stats_req *req = dev->stats_mem.va; | 1185 | struct ocrdma_rdma_stats_req *req = dev->stats_mem.va; |
1191 | struct ocrdma_mqe *mqe = &dev->stats_mem.mqe; | 1186 | struct ocrdma_mqe *mqe = &dev->stats_mem.mqe; |
1192 | struct ocrdma_rdma_stats_resp *old_stats = NULL; | 1187 | struct ocrdma_rdma_stats_resp *old_stats; |
1193 | int status; | 1188 | int status; |
1194 | 1189 | ||
1195 | old_stats = kzalloc(sizeof(*old_stats), GFP_KERNEL); | 1190 | old_stats = kmalloc(sizeof(*old_stats), GFP_KERNEL); |
1196 | if (old_stats == NULL) | 1191 | if (old_stats == NULL) |
1197 | return -ENOMEM; | 1192 | return -ENOMEM; |
1198 | 1193 | ||
@@ -1235,10 +1230,9 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev) | |||
1235 | struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp; | 1230 | struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp; |
1236 | struct mgmt_hba_attribs *hba_attribs; | 1231 | struct mgmt_hba_attribs *hba_attribs; |
1237 | 1232 | ||
1238 | mqe = ocrdma_alloc_mqe(); | 1233 | mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL); |
1239 | if (!mqe) | 1234 | if (!mqe) |
1240 | return status; | 1235 | return status; |
1241 | memset(mqe, 0, sizeof(*mqe)); | ||
1242 | 1236 | ||
1243 | dma.size = sizeof(struct ocrdma_get_ctrl_attribs_rsp); | 1237 | dma.size = sizeof(struct ocrdma_get_ctrl_attribs_rsp); |
1244 | dma.va = dma_alloc_coherent(&dev->nic_info.pdev->dev, | 1238 | dma.va = dma_alloc_coherent(&dev->nic_info.pdev->dev, |