From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Marc Zyngier <maz@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Tsahee Zidenberg <tsahee@annapurnalabs.com>,
Antoine Tenart <atenart@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@bootlin.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: [PATCH v1 4/7] irqchip/gic-v3: Switch to bitmap_zalloc()
Date: Fri, 18 Jun 2021 18:16:54 +0300 [thread overview]
Message-ID: <20210618151657.65305-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210618151657.65305-1-andriy.shevchenko@linux.intel.com>
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/irqchip/irq-gic-v3-its.c | 9 ++++-----
drivers/irqchip/irq-gic-v3-mbi.c | 5 ++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index ba39668c3e08..daa5b1c968f0 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -2140,7 +2140,7 @@ static unsigned long *its_lpi_alloc(int nr_irqs, u32 *base, int *nr_ids)
if (err)
goto out;
- bitmap = kcalloc(BITS_TO_LONGS(nr_irqs), sizeof (long), GFP_ATOMIC);
+ bitmap = bitmap_zalloc(nr_irqs, GFP_ATOMIC);
if (!bitmap)
goto out;
@@ -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)
{
WARN_ON(free_lpi_range(base, nr_ids));
- kfree(bitmap);
+ bitmap_free(bitmap);
}
static void gic_reset_prop_table(void *va)
@@ -3376,8 +3376,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
if (alloc_lpis) {
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
if (lpi_map)
- col_map = kcalloc(nr_lpis, sizeof(*col_map),
- GFP_KERNEL);
+ col_map = kcalloc(nr_lpis, sizeof(*col_map), GFP_KERNEL);
} else {
col_map = kcalloc(nr_ites, sizeof(*col_map), GFP_KERNEL);
nr_lpis = 0;
@@ -3387,7 +3386,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
if (!dev || !itt || !col_map || (!lpi_map && alloc_lpis)) {
kfree(dev);
kfree(itt);
- kfree(lpi_map);
+ bitmap_free(lpi_map);
kfree(col_map);
return NULL;
}
diff --git a/drivers/irqchip/irq-gic-v3-mbi.c b/drivers/irqchip/irq-gic-v3-mbi.c
index e81e89a81cb5..b84c9c2eccdc 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -290,8 +290,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
if (ret)
goto err_free_mbi;
- mbi_ranges[n].bm = kcalloc(BITS_TO_LONGS(mbi_ranges[n].nr_spis),
- sizeof(long), GFP_KERNEL);
+ mbi_ranges[n].bm = bitmap_zalloc(mbi_ranges[n].nr_spis, GFP_KERNEL);
if (!mbi_ranges[n].bm) {
ret = -ENOMEM;
goto err_free_mbi;
@@ -329,7 +328,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
err_free_mbi:
if (mbi_ranges) {
for (n = 0; n < mbi_range_nr; n++)
- kfree(mbi_ranges[n].bm);
+ bitmap_free(mbi_ranges[n].bm);
kfree(mbi_ranges);
}
--
2.30.2
next prev parent reply other threads:[~2021-06-18 15:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 15:16 [PATCH v1 1/7] irqchip: Switch to bitmap_zalloc() Andy Shevchenko
2021-06-18 15:16 ` [PATCH v1 2/7] irqchip/alpine-msi: " Andy Shevchenko
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Andy Shevchenko
2021-06-18 15:16 ` [PATCH v1 3/7] irqchip/gic-v2m: " Andy Shevchenko
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Andy Shevchenko
2021-06-18 15:16 ` Andy Shevchenko [this message]
2021-07-26 17:05 ` [PATCH v1 4/7] irqchip/gic-v3: " Marc Zyngier
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Andy Shevchenko
2021-06-18 15:16 ` [PATCH v1 5/7] irqchip/ls-scfg-msi: Switch to devm_bitmap_zalloc() Andy Shevchenko
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Andy Shevchenko
2021-06-18 15:16 ` [PATCH v1 6/7] irqchip/mvebu-gicp: " Andy Shevchenko
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Andy Shevchenko
2021-06-18 15:16 ` [PATCH v1 7/7] irqchip/mvebu-odmi: Switch to bitmap_zalloc() Andy Shevchenko
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Andy Shevchenko
2021-07-26 17:12 ` [irqchip: irq/irqchip-next] irqchip/partitions: " irqchip-bot for Andy Shevchenko
2021-07-26 17:12 ` [PATCH v1 1/7] irqchip: " Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210618151657.65305-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=andrew@lunn.ch \
--cc=atenart@kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=tglx@linutronix.de \
--cc=tsahee@annapurnalabs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).