G0_RBPS_BS + (group * 32));
 
        /* bitmap table */
-       he_dev->rbpl_table = kmalloc_array(BITS_TO_LONGS(RBPL_TABLE_SIZE),
-                                          sizeof(*he_dev->rbpl_table),
-                                          GFP_KERNEL);
+       he_dev->rbpl_table = bitmap_zalloc(RBPL_TABLE_SIZE, GFP_KERNEL);
        if (!he_dev->rbpl_table) {
                hprintk("unable to allocate rbpl bitmap table\n");
                return -ENOMEM;
        }
-       bitmap_zero(he_dev->rbpl_table, RBPL_TABLE_SIZE);
 
        /* rbpl_virt 64-bit pointers */
        he_dev->rbpl_virt = kmalloc_array(RBPL_TABLE_SIZE,
 out_free_rbpl_virt:
        kfree(he_dev->rbpl_virt);
 out_free_rbpl_table:
-       kfree(he_dev->rbpl_table);
+       bitmap_free(he_dev->rbpl_table);
 
        return -ENOMEM;
 }
        }
 
        kfree(he_dev->rbpl_virt);
-       kfree(he_dev->rbpl_table);
+       bitmap_free(he_dev->rbpl_table);
        dma_pool_destroy(he_dev->rbpl_pool);
 
        if (he_dev->rbrq_base)