Commit 13506868 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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

drivers/pci/controller/pcie-iproc-msi.c

+2 −2
Original line number Diff line number Diff line
@@ -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;