Skip to contentSkip to conversation

PCI: Switch to bitmap_zalloc()

PATCH Applied Andy Shevchenko 2 participants 2 messages Aug 30, 2018 – Sep 6, 2018 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: Switch to bitmap_zalloc()

Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.

---
 drivers/pci/pci.c   | 3 +--
 drivers/pci/probe.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/pci/pci.c +1 -2
index 29ff9619b5fa..c6de7e0dd3fa 100644
@@ -5689,8 +5689,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
 void pci_add_dma_alias(struct pci_dev *dev, u8 devfn)
 {
 	if (!dev->dma_alias_mask)
-		dev->dma_alias_mask = kcalloc(BITS_TO_LONGS(U8_MAX),
-					      sizeof(long), GFP_KERNEL);
+		dev->dma_alias_mask = bitmap_zalloc(U8_MAX, GFP_KERNEL);
 	if (!dev->dma_alias_mask) {
 		pci_warn(dev, "Unable to allocate DMA alias mask\n");
 		return;
drivers/pci/probe.c +1 -1
index ec784009a36b..b6465a59aeb1 100644
@@ -2140,7 +2140,7 @@ static void pci_release_dev(struct device *dev)
 	pcibios_release_device(pci_dev);
 	pci_bus_put(pci_dev->bus);
 	kfree(pci_dev->driver_override);
-	kfree(pci_dev->dma_alias_mask);
+	bitmap_free(pci_dev->dma_alias_mask);
 	kfree(pci_dev);
 }
 
Signature · 1 line
2.18.0
#1 lore raw
Quoted 4 lines · Andy Shevchenko

Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.

Applied to pci/misc for v4.20, thanks!

Quoted 35 lines
---
 drivers/pci/pci.c   | 3 +--
 drivers/pci/probe.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/pci/pci.c +1 -2
index 29ff9619b5fa..c6de7e0dd3fa 100644
@@ -5689,8 +5689,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
 void pci_add_dma_alias(struct pci_dev *dev, u8 devfn)
 {
 	if (!dev->dma_alias_mask)
-		dev->dma_alias_mask = kcalloc(BITS_TO_LONGS(U8_MAX),
-					      sizeof(long), GFP_KERNEL);
+		dev->dma_alias_mask = bitmap_zalloc(U8_MAX, GFP_KERNEL);
 	if (!dev->dma_alias_mask) {
 		pci_warn(dev, "Unable to allocate DMA alias mask\n");
 		return;
drivers/pci/probe.c +1 -1
index ec784009a36b..b6465a59aeb1 100644
@@ -2140,7 +2140,7 @@ static void pci_release_dev(struct device *dev)
 	pcibios_release_device(pci_dev);
 	pci_bus_put(pci_dev->bus);
 	kfree(pci_dev->driver_override);
-	kfree(pci_dev->dma_alias_mask);
+	bitmap_free(pci_dev->dma_alias_mask);
 	kfree(pci_dev);
 }
 
Signature · 1 line
2.18.0