sgi-xp: Use the bitmap API to allocate bitmaps

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.

Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/ef49726d60f6a531428609f60a2398b6c3d9a26e.1656966181.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 50644f83e78ce9c0a9199d9804f7d87190d5fc08..2396ba3b03bdf46ede46e415bb6aabc88c8f83ab 100644 (file)
--- 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);