Commit 13506868 authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/ctrl/iproc'

- Use bitmap API to allocate bitmaps instead of doing it by hand
  (Christophe JAILLET)

* pci/ctrl/iproc:
  PCI: iproc: Use bitmap API to allocate bitmaps
parents 468276d4 52664090
...@@ -589,8 +589,8 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node) ...@@ -589,8 +589,8 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node)
msi->has_inten_reg = true; msi->has_inten_reg = true;
msi->nr_msi_vecs = msi->nr_irqs * EQ_LEN; msi->nr_msi_vecs = msi->nr_irqs * EQ_LEN;
msi->bitmap = devm_kcalloc(pcie->dev, BITS_TO_LONGS(msi->nr_msi_vecs), msi->bitmap = devm_bitmap_zalloc(pcie->dev, msi->nr_msi_vecs,
sizeof(*msi->bitmap), GFP_KERNEL); GFP_KERNEL);
if (!msi->bitmap) if (!msi->bitmap)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment