commit 030e89ecab55b6e105e19fa830a7a7160237f19a
author Sakari Ailus <sakari.ailus@iki.fi> Wed Dec 16 11:32:36 2015 -0200
committer Mauro Carvalho Chehab <mchehab@osg.samsung.com> Mon Jan 11 12:19:22 2016 -0200
tree 8b2115efa6e3c9d868ed889b55cf0a2e5e092d19
parent bb0faebdc1d377705081fed67af3f3f3001ac7b8

[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 <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

drivers/media/media-entity.c

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 3cad525..5bd6f88 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -81,14 +81,10 @@
 __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 @@
  */
 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);