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

diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controller/pcie-iproc-msi.c
index 757b7fb..fee036b 100644 (file)
--- a/drivers/pci/controller/pcie-iproc-msi.c
+++ b/drivers/pci/controller/pcie-iproc-msi.c
@@ -589,8 +589,8 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node)
                msi->has_inten_reg = true;
 
        msi->nr_msi_vecs = msi->nr_irqs * EQ_LEN;
-       msi->bitmap = devm_kcalloc(pcie->dev, BITS_TO_LONGS(msi->nr_msi_vecs),
-                                  sizeof(*msi->bitmap), GFP_KERNEL);
+       msi->bitmap = devm_bitmap_zalloc(pcie->dev, msi->nr_msi_vecs,
+                                        GFP_KERNEL);
        if (!msi->bitmap)
                return -ENOMEM;