media: videobuf2-core: Rework and rename helper for request buffer count

The helper indicating whether buffers are associated with the request is
reworked and renamed to return the number of associated buffer objects.

This is useful for drivers that need to check how many buffers are in
the request to validate it.

Existing users of the helper don't need particular adaptation since the
meaning of zero/non-zero remains consistent.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cette révision appartient à :
Paul Kocialkowski
2018-09-13 10:51:51 -04:00
révisé par Mauro Carvalho Chehab
Parent 7390ba4397
révision 515c5a7333
3 fichiers modifiés avec 11 ajouts et 13 suppressions

Voir le fichier

@@ -1368,23 +1368,21 @@ bool vb2_request_object_is_buffer(struct media_request_object *obj)
}
EXPORT_SYMBOL_GPL(vb2_request_object_is_buffer);
bool vb2_request_has_buffers(struct media_request *req)
unsigned int vb2_request_buffer_cnt(struct media_request *req)
{
struct media_request_object *obj;
unsigned long flags;
bool has_buffers = false;
unsigned int buffer_cnt = 0;
spin_lock_irqsave(&req->lock, flags);
list_for_each_entry(obj, &req->objects, list) {
if (vb2_request_object_is_buffer(obj)) {
has_buffers = true;
break;
}
}
list_for_each_entry(obj, &req->objects, list)
if (vb2_request_object_is_buffer(obj))
buffer_cnt++;
spin_unlock_irqrestore(&req->lock, flags);
return has_buffers;
return buffer_cnt;
}
EXPORT_SYMBOL_GPL(vb2_request_has_buffers);
EXPORT_SYMBOL_GPL(vb2_request_buffer_cnt);
int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb)
{

Voir le fichier

@@ -1139,7 +1139,7 @@ int vb2_request_validate(struct media_request *req)
struct media_request_object *obj;
int ret = 0;
if (!vb2_request_has_buffers(req))
if (!vb2_request_buffer_cnt(req))
return -ENOENT;
list_for_each_entry(obj, &req->objects, list) {