Commit ff5fe886 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Marc Zyngier

irqchip/gic-v3: 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 *.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210618151657.65305-4-andriy.shevchenko@linux.intel.com
parent 81d3c9e7
...@@ -2140,7 +2140,7 @@ static unsigned long *its_lpi_alloc(int nr_irqs, u32 *base, int *nr_ids) ...@@ -2140,7 +2140,7 @@ static unsigned long *its_lpi_alloc(int nr_irqs, u32 *base, int *nr_ids)
if (err) if (err)
goto out; goto out;
bitmap = kcalloc(BITS_TO_LONGS(nr_irqs), sizeof (long), GFP_ATOMIC); bitmap = bitmap_zalloc(nr_irqs, GFP_ATOMIC);
if (!bitmap) if (!bitmap)
goto out; goto out;
...@@ -2156,7 +2156,7 @@ static unsigned long *its_lpi_alloc(int nr_irqs, u32 *base, int *nr_ids) ...@@ -2156,7 +2156,7 @@ static unsigned long *its_lpi_alloc(int nr_irqs, u32 *base, int *nr_ids)
static void its_lpi_free(unsigned long *bitmap, u32 base, u32 nr_ids) static void its_lpi_free(unsigned long *bitmap, u32 base, u32 nr_ids)
{ {
WARN_ON(free_lpi_range(base, nr_ids)); WARN_ON(free_lpi_range(base, nr_ids));
kfree(bitmap); bitmap_free(bitmap);
} }
static void gic_reset_prop_table(void *va) static void gic_reset_prop_table(void *va)
...@@ -3387,7 +3387,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, ...@@ -3387,7 +3387,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
if (!dev || !itt || !col_map || (!lpi_map && alloc_lpis)) { if (!dev || !itt || !col_map || (!lpi_map && alloc_lpis)) {
kfree(dev); kfree(dev);
kfree(itt); kfree(itt);
kfree(lpi_map); bitmap_free(lpi_map);
kfree(col_map); kfree(col_map);
return NULL; return NULL;
} }
......
...@@ -290,8 +290,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent) ...@@ -290,8 +290,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
if (ret) if (ret)
goto err_free_mbi; goto err_free_mbi;
mbi_ranges[n].bm = kcalloc(BITS_TO_LONGS(mbi_ranges[n].nr_spis), mbi_ranges[n].bm = bitmap_zalloc(mbi_ranges[n].nr_spis, GFP_KERNEL);
sizeof(long), GFP_KERNEL);
if (!mbi_ranges[n].bm) { if (!mbi_ranges[n].bm) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_free_mbi; goto err_free_mbi;
...@@ -329,7 +328,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent) ...@@ -329,7 +328,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
err_free_mbi: err_free_mbi:
if (mbi_ranges) { if (mbi_ranges) {
for (n = 0; n < mbi_range_nr; n++) for (n = 0; n < mbi_range_nr; n++)
kfree(mbi_ranges[n].bm); bitmap_free(mbi_ranges[n].bm);
kfree(mbi_ranges); kfree(mbi_ranges);
} }
......
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