summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/qib/qib_pcie.c
diff options
context:
space:
mode:
authorMike Marciniszyn2015-01-16 16:52:18 +0100
committerRoland Dreier2015-02-20 18:04:09 +0100
commita46a2802f7470045714e8086d88a8b966b0753c3 (patch)
tree44b827ad27fd01f6442a89e667c32dc2a6503d1f /drivers/infiniband/hw/qib/qib_pcie.c
parentIB/qib: Fix sizeof checkpatch warnings (diff)
downloadkernel-qcow2-linux-a46a2802f7470045714e8086d88a8b966b0753c3.tar.gz
kernel-qcow2-linux-a46a2802f7470045714e8086d88a8b966b0753c3.tar.xz
kernel-qcow2-linux-a46a2802f7470045714e8086d88a8b966b0753c3.zip
IB/qib: Fix checkpatch warnings
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_pcie.c')
-rw-r--r--drivers/infiniband/hw/qib/qib_pcie.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 61a0046efb76..243f8065dcad 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -210,7 +210,7 @@ static void qib_msix_setup(struct qib_devdata *dd, int pos, u32 *msixcnt,
/* We can't pass qib_msix_entry array to qib_msix_setup
* so use a dummy msix_entry array and copy the allocated
* irq back to the qib_msix_entry array. */
- msix_entry = kmalloc(nvec * sizeof(*msix_entry), GFP_KERNEL);
+ msix_entry = kcalloc(nvec, sizeof(*msix_entry), GFP_KERNEL);
if (!msix_entry)
goto do_intx;
@@ -234,8 +234,10 @@ free_msix_entry:
kfree(msix_entry);
do_intx:
- qib_dev_err(dd, "pci_enable_msix_range %d vectors failed: %d, "
- "falling back to INTx\n", nvec, ret);
+ qib_dev_err(
+ dd,
+ "pci_enable_msix_range %d vectors failed: %d, falling back to INTx\n",
+ nvec, ret);
*msixcnt = 0;
qib_enable_intx(dd->pcidev);
}