* [PATCH v1 1/2] irqchip/gic-v3: Switch to bitmap_zalloc()
@ 2018-08-30 10:31 Andy Shevchenko
2018-08-30 10:31 ` [PATCH v1 2/2] irqchip/alpine-msi: " Andy Shevchenko
2019-01-07 15:58 ` [PATCH v1 1/2] irqchip/gic-v3: " Andy Shevchenko
0 siblings, 2 replies; 3+ messages in thread
From: Andy Shevchenko @ 2018-08-30 10:31 UTC (permalink / raw)
To: linux-arm-kernel
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 316a57530f6d..497589ebd950 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -1577,7 +1577,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;
@@ -1593,7 +1593,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 struct page *its_allocate_prop_table(gfp_t gfp_flags)
@@ -2215,8 +2215,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;
@@ -2226,7 +2225,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 ad70e7c416e3..7d783fc56169 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -284,8 +284,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;
@@ -323,7 +322,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.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v1 2/2] irqchip/alpine-msi: Switch to bitmap_zalloc()
2018-08-30 10:31 [PATCH v1 1/2] irqchip/gic-v3: Switch to bitmap_zalloc() Andy Shevchenko
@ 2018-08-30 10:31 ` Andy Shevchenko
2019-01-07 15:58 ` [PATCH v1 1/2] irqchip/gic-v3: " Andy Shevchenko
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2018-08-30 10:31 UTC (permalink / raw)
To: linux-arm-kernel
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-alpine-msi.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c
index 23a3b877f7f1..3340324c7a02 100644
--- a/drivers/irqchip/irq-alpine-msi.c
+++ b/drivers/irqchip/irq-alpine-msi.c
@@ -268,9 +268,7 @@ static int alpine_msix_init(struct device_node *node,
goto err_priv;
}
- priv->msi_map = kcalloc(BITS_TO_LONGS(priv->num_spis),
- sizeof(*priv->msi_map),
- GFP_KERNEL);
+ priv->msi_map = bitmap_zalloc(priv->num_spis, GFP_KERNEL);
if (!priv->msi_map) {
ret = -ENOMEM;
goto err_priv;
@@ -286,7 +284,7 @@ static int alpine_msix_init(struct device_node *node,
return 0;
err_map:
- kfree(priv->msi_map);
+ bitmap_free(priv->msi_map);
err_priv:
kfree(priv);
return ret;
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/2] irqchip/gic-v3: Switch to bitmap_zalloc()
2018-08-30 10:31 [PATCH v1 1/2] irqchip/gic-v3: Switch to bitmap_zalloc() Andy Shevchenko
2018-08-30 10:31 ` [PATCH v1 2/2] irqchip/alpine-msi: " Andy Shevchenko
@ 2019-01-07 15:58 ` Andy Shevchenko
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2019-01-07 15:58 UTC (permalink / raw)
To: Tsahee Zidenberg, Antoine Tenart, linux-arm-kernel,
Thomas Gleixner, Jason Cooper, Marc Zyngier, linux-kernel
On Thu, Aug 30, 2018 at 01:31:13PM +0300, Andy Shevchenko wrote:
> Switch to bitmap_zalloc() to show clearly what we are allocating.
> Besides that it returns pointer of bitmap type instead of opaque void *.
>
Any comments on the patches?
> 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 316a57530f6d..497589ebd950 100644
> --- a/drivers/irqchip/irq-gic-v3-its.c
> +++ b/drivers/irqchip/irq-gic-v3-its.c
> @@ -1577,7 +1577,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;
>
> @@ -1593,7 +1593,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 struct page *its_allocate_prop_table(gfp_t gfp_flags)
> @@ -2215,8 +2215,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;
> @@ -2226,7 +2225,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 ad70e7c416e3..7d783fc56169 100644
> --- a/drivers/irqchip/irq-gic-v3-mbi.c
> +++ b/drivers/irqchip/irq-gic-v3-mbi.c
> @@ -284,8 +284,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;
> @@ -323,7 +322,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.18.0
>
--
With Best Regards,
Andy Shevchenko
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-07 15:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-30 10:31 [PATCH v1 1/2] irqchip/gic-v3: Switch to bitmap_zalloc() Andy Shevchenko
2018-08-30 10:31 ` [PATCH v1 2/2] irqchip/alpine-msi: " Andy Shevchenko
2019-01-07 15:58 ` [PATCH v1 1/2] irqchip/gic-v3: " Andy Shevchenko
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).