summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-08-30 13:32:36 +0300
committerBjorn Helgaas <bhelgaas@google.com>2018-09-17 16:35:14 -0500
commitc6635792737b881021ead417b281067d56ed3380 (patch)
tree5dbd6dfe1ca0050a7523a3374ab44a07d0ca2b8e /drivers/pci
parent1ccce46c5e8b8a0d2606fb8bb72bff069ffdc3ab (diff)
PCI: Allocate dma_alias_mask with bitmap_zalloc()
Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type ("unsigned long *") instead of the opaque "void *". Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c3
-rw-r--r--drivers/pci/probe.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1835f3a7aa8d..dc3313d26c79 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5690,8 +5690,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;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 201f9e5ff55c..7c422ccbf9b4 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2143,7 +2143,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);
}