[media] media: Remove pre-allocated entity enumeration bitmap

The bitmaps for entity enumerations used to be statically allocated. Now
that the drivers have been converted to use the new interface which
explicitly initialises the enum objects, drop the pre-allocated bitmaps.

Signed-off-by: Sakari Ailus <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
This commit is contained in:
Sakari Ailus 2015-12-16 11:32:36 -02:00 • committed by Mauro Carvalho Chehab
commit 030e89ecab
2 changed files with 7 additions and 18 deletions

View file

@ -81,14 +81,10 @@ static inline const char *intf_type(struct media_interface *intf)
__must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum,
int idx_max)
{
if (idx_max > MEDIA_ENTITY_ENUM_MAX_ID) {
ent_enum->bmap = kcalloc(DIV_ROUND_UP(idx_max, BITS_PER_LONG),
sizeof(long), GFP_KERNEL);
if (!ent_enum->bmap)
return -ENOMEM;
} else {
ent_enum->bmap = ent_enum->prealloc_bmap;
}
ent_enum->bmap = kcalloc(DIV_ROUND_UP(idx_max, BITS_PER_LONG),
sizeof(long), GFP_KERNEL);
if (!ent_enum->bmap)
return -ENOMEM;
bitmap_zero(ent_enum->bmap, idx_max);
ent_enum->idx_max = idx_max;
@ -104,9 +100,7 @@ EXPORT_SYMBOL_GPL(__media_entity_enum_init);
*/
void media_entity_enum_cleanup(struct media_entity_enum *ent_enum)
{
if (ent_enum->bmap != ent_enum->prealloc_bmap)
kfree(ent_enum->bmap);
ent_enum->bmap = NULL;
kfree(ent_enum->bmap);
}
EXPORT_SYMBOL_GPL(media_entity_enum_cleanup);