1. Patchew
  2. linux
  3. View series

[PATCH] sgi-xp: Use the bitmap API to allocate bitmaps

Christophe JAILLET posted 1 patch 3 years, 9 months ago 
drivers/misc/sgi-xp/xpnet.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
[PATCH] sgi-xp: Use the bitmap API to allocate bitmaps
Posted by Christophe JAILLET 3 years, 9 months ago 
Use bitmap_zalloc()/bitmap_free() instead of hand-writing them.

It is less verbose and it improves the semantic.

While at it, remove a useless cast in a bitmap_empty() call.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/misc/sgi-xp/xpnet.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 50644f83e78c..2396ba3b03bd 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -285,7 +285,7 @@ xpnet_connection_activity(enum xp_retval reason, short partid, int channel,
 		__clear_bit(partid, xpnet_broadcast_partitions);
 		spin_unlock_bh(&xpnet_broadcast_lock);
 
-		if (bitmap_empty((unsigned long *)xpnet_broadcast_partitions,
+		if (bitmap_empty(xpnet_broadcast_partitions,
 				 xp_max_npartitions)) {
 			netif_carrier_off(xpnet_device);
 		}
@@ -522,9 +522,8 @@ xpnet_init(void)
 
 	dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
 
-	xpnet_broadcast_partitions = kcalloc(BITS_TO_LONGS(xp_max_npartitions),
-					     sizeof(long),
-					     GFP_KERNEL);
+	xpnet_broadcast_partitions = bitmap_zalloc(xp_max_npartitions,
+						   GFP_KERNEL);
 	if (xpnet_broadcast_partitions == NULL)
 		return -ENOMEM;
 
@@ -535,7 +534,7 @@ xpnet_init(void)
 	xpnet_device = alloc_netdev(0, XPNET_DEVICE_NAME, NET_NAME_UNKNOWN,
 				    ether_setup);
 	if (xpnet_device == NULL) {
-		kfree(xpnet_broadcast_partitions);
+		bitmap_free(xpnet_broadcast_partitions);
 		return -ENOMEM;
 	}
 
@@ -574,7 +573,7 @@ xpnet_init(void)
 	result = register_netdev(xpnet_device);
 	if (result != 0) {
 		free_netdev(xpnet_device);
-		kfree(xpnet_broadcast_partitions);
+		bitmap_free(xpnet_broadcast_partitions);
 	}
 
 	return result;
@@ -590,7 +589,7 @@ xpnet_exit(void)
 
 	unregister_netdev(xpnet_device);
 	free_netdev(xpnet_device);
-	kfree(xpnet_broadcast_partitions);
+	bitmap_free(xpnet_broadcast_partitions);
 }
 
 module_exit(xpnet_exit);
-- 
2.34.1
Re: [PATCH] sgi-xp: Use the bitmap API to allocate bitmaps
Posted by Steve Wahl 3 years, 9 months ago 
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>

On Mon, Jul 04, 2022 at 10:23:17PM +0200, Christophe JAILLET wrote:
> Use bitmap_zalloc()/bitmap_free() instead of hand-writing them.
> 
> It is less verbose and it improves the semantic.
> 
> While at it, remove a useless cast in a bitmap_empty() call.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/misc/sgi-xp/xpnet.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
> index 50644f83e78c..2396ba3b03bd 100644
> --- a/drivers/misc/sgi-xp/xpnet.c
> +++ b/drivers/misc/sgi-xp/xpnet.c
> @@ -285,7 +285,7 @@ xpnet_connection_activity(enum xp_retval reason, short partid, int channel,
>  		__clear_bit(partid, xpnet_broadcast_partitions);
>  		spin_unlock_bh(&xpnet_broadcast_lock);
>  
> -		if (bitmap_empty((unsigned long *)xpnet_broadcast_partitions,
> +		if (bitmap_empty(xpnet_broadcast_partitions,
>  				 xp_max_npartitions)) {
>  			netif_carrier_off(xpnet_device);
>  		}
> @@ -522,9 +522,8 @@ xpnet_init(void)
>  
>  	dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
>  
> -	xpnet_broadcast_partitions = kcalloc(BITS_TO_LONGS(xp_max_npartitions),
> -					     sizeof(long),
> -					     GFP_KERNEL);
> +	xpnet_broadcast_partitions = bitmap_zalloc(xp_max_npartitions,
> +						   GFP_KERNEL);
>  	if (xpnet_broadcast_partitions == NULL)
>  		return -ENOMEM;
>  
> @@ -535,7 +534,7 @@ xpnet_init(void)
>  	xpnet_device = alloc_netdev(0, XPNET_DEVICE_NAME, NET_NAME_UNKNOWN,
>  				    ether_setup);
>  	if (xpnet_device == NULL) {
> -		kfree(xpnet_broadcast_partitions);
> +		bitmap_free(xpnet_broadcast_partitions);
>  		return -ENOMEM;
>  	}
>  
> @@ -574,7 +573,7 @@ xpnet_init(void)
>  	result = register_netdev(xpnet_device);
>  	if (result != 0) {
>  		free_netdev(xpnet_device);
> -		kfree(xpnet_broadcast_partitions);
> +		bitmap_free(xpnet_broadcast_partitions);
>  	}
>  
>  	return result;
> @@ -590,7 +589,7 @@ xpnet_exit(void)
>  
>  	unregister_netdev(xpnet_device);
>  	free_netdev(xpnet_device);
> -	kfree(xpnet_broadcast_partitions);
> +	bitmap_free(xpnet_broadcast_partitions);
>  }
>  
>  module_exit(xpnet_exit);
> -- 
> 2.34.1
> 

-- 
Steve Wahl, Hewlett Packard Enterprise

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.