Commit 49b38947 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: mc: entity: Merge media_entity_enum_init and __media_entity_enum_init 



The media_entity_enum_init() function is a wrapper around
__media_entity_enum_init() that turns a media_device pointer argument
into the maximum entity ID in the corresponding media graph.
__media_entity_enum_init() is never used outside of
media_entity_enum_init(), so the two functions can be merged together.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8db465f7

drivers/media/mc/mc-entity.c

+6 −4
Original line number Diff line number Diff line
@@ -59,10 +59,12 @@ static inline const char *link_type_name(struct media_link *link) 
	}

}



__must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum,

					  int idx_max)

__must_check int media_entity_enum_init(struct media_entity_enum *ent_enum,

					struct media_device *mdev)

{

	idx_max = ALIGN(idx_max, BITS_PER_LONG);

	int idx_max;



	idx_max = ALIGN(mdev->entity_internal_idx_max + 1, BITS_PER_LONG);

	ent_enum->bmap = bitmap_zalloc(idx_max, GFP_KERNEL);

	if (!ent_enum->bmap)

		return -ENOMEM;
@@ -71,7 +73,7 @@ __must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum, 


	return 0;

}

EXPORT_SYMBOL_GPL(__media_entity_enum_init);

EXPORT_SYMBOL_GPL(media_entity_enum_init);



void media_entity_enum_cleanup(struct media_entity_enum *ent_enum)

{

include/media/media-device.h

+0 −15
Original line number Diff line number Diff line
@@ -191,21 +191,6 @@ struct usb_device; 
#define MEDIA_DEV_NOTIFY_PRE_LINK_CH	0

#define MEDIA_DEV_NOTIFY_POST_LINK_CH	1



/**

 * media_entity_enum_init - Initialise an entity enumeration

 *

 * @ent_enum: Entity enumeration to be initialised

 * @mdev: The related media device

 *

 * Return: zero on success or a negative error code.

 */

static inline __must_check int media_entity_enum_init(

	struct media_entity_enum *ent_enum, struct media_device *mdev)

{

	return __media_entity_enum_init(ent_enum,

					mdev->entity_internal_idx_max + 1);

}



/**

 * media_device_init() - Initializes a media device element

 *

include/media/media-entity.h

+5 −5
Original line number Diff line number Diff line
@@ -439,15 +439,15 @@ static inline bool is_media_entity_v4l2_subdev(struct media_entity *entity) 
}



/**

 * __media_entity_enum_init - Initialise an entity enumeration

 * media_entity_enum_init - Initialise an entity enumeration

 *

 * @ent_enum: Entity enumeration to be initialised

 * @idx_max: Maximum number of entities in the enumeration

 * @mdev: The related media device

 *

 * Return: Returns zero on success or a negative error code.

 * Return: zero on success or a negative error code.

 */

__must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum,

					  int idx_max);

__must_check int media_entity_enum_init(struct media_entity_enum *ent_enum,

					struct media_device *mdev);



/**

 * media_entity_enum_cleanup - Release resources of an entity enumeration