bridge: 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 0363f1bdc401db109d81b54195f6d93ddb24416b..3bb66508f07d4fda006568313e64547b88281f6f 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -394,8 +394,7 @@ static int find_portno(struct net_bridge *br)
        struct net_bridge_port *p;
        unsigned long *inuse;
 
-       inuse = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
-                       GFP_KERNEL);
+       inuse = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);
        if (!inuse)
                return -ENOMEM;
 
@@ -404,7 +403,7 @@ static int find_portno(struct net_bridge *br)
                set_bit(p->port_no, inuse);
        }
        index = find_first_zero_bit(inuse, BR_MAX_PORTS);
-       kfree(inuse);
+       bitmap_free(inuse);
 
        return (index >= BR_MAX_PORTS) ? -EXFULL : index;
 }

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 7df269092103c3e00dc79ecc7904c4f859f62cce..bb6ba794864f9cbd03fa162210c0cc624bf13a98 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -877,8 +877,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
                return 0;
        }
 
-       changed = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
-                         GFP_KERNEL);
+       changed = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);
        if (!changed)
                return -ENOMEM;
 
@@ -925,7 +924,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
        br->default_pvid = pvid;
 
 out:
-       kfree(changed);
+       bitmap_free(changed);
        return err;
 
 err_port: